Skip to content

Call StringMapIterator from llvm: scope

MastaG requested to merge mastag/mesa:fix/armhf into main

What does this MR do and why?

This fixes the build error on arm 32bit platforms:

../src/gallium/auxiliary/gallivm/lp_bld_misc.cpp: In function ‘void lp_build_fill_mattrs(std::vector<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > >&)’:
../src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:335:9: error: ‘StringMapIterator’ was not declared in this scope; did you mean ‘llvm::StringMapIterator’?
  335 |    for (StringMapIterator<bool> f = features.begin();
      |         ^~~~~~~~~~~~~~~~~
      |         llvm::StringMapIterator
In file included from /usr/include/llvm-17/llvm/ExecutionEngine/ExecutionEngine.h:20,
                 from ../src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:50:
/usr/include/llvm-17/llvm/ADT/StringMap.h:27:35: note: ‘llvm::StringMapIterator’ declared here
   27 | template <typename ValueTy> class StringMapIterator;
      |                                   ^~~~~~~~~~~~~~~~~
../src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:335:27: error: expected primary-expression before ‘bool’
  335 |    for (StringMapIterator<bool> f = features.begin();
      |                           ^~~~
../src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:336:9: error: ‘f’ was not declared in this scope
  336 |         f != features.end();
      |         ^

Fixes: #11392 (closed)

Merge request reports