[llvm] [CFIFixup] Factor logic into helpers and use range-based loops (NFC) (PR #125137)

Fri Jan 31 11:48:47 PST 2025

llvm-ci wrote:

LLVM Buildbot has detected a new failure on builder `clang-hip-vega20` running on `hip-vega20-0` while building `llvm` at step 3 "annotate".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/123/builds/12855

<details>
<summary>Here is the relevant piece of the build log for the reference</summary>

```
Step 3 (annotate) failure: '../llvm-zorg/zorg/buildbot/builders/annotated/hip-build.sh --jobs=' (failure)
...
[13/148] Linking CXX executable bin/llvm-ctxprof-util
[14/148] Linking CXX executable bin/llvm-sim
[15/148] Linking CXX executable bin/llvm-cxxdump
[16/148] Linking CXX executable bin/llvm-ifs
[17/148] Linking CXX executable bin/llvm-mca
[18/148] Linking CXX executable bin/llvm-readtapi
[19/148] Linking CXX executable bin/llvm-debuginfod
[20/148] Linking CXX executable bin/llvm-mc
[21/148] Linking CXX executable bin/llvm-objcopy
[22/148] Building CXX object lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CFIFixup.cpp.o
FAILED: lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CFIFixup.cpp.o 
ccache /usr/bin/c++ -DGTEST_HAS_RTTI=0 -D_DEBUG -D_GLIBCXX_ASSERTIONS -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/home/botworker/bbot/clang-hip-vega20/botworker/clang-hip-vega20/llvm/lib/CodeGen -I/home/botworker/bbot/clang-hip-vega20/llvm-project/llvm/lib/CodeGen -I/home/botworker/bbot/clang-hip-vega20/botworker/clang-hip-vega20/llvm/include -I/home/botworker/bbot/clang-hip-vega20/llvm-project/llvm/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -fno-lifetime-dse -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wimplicit-fallthrough -Wno-uninitialized -Wno-nonnull -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wno-misleading-indentation -Wctad-maybe-unsupported -fdiagnostics-color -ffunction-sections -fdata-sections -O3 -DNDEBUG  -fno-exceptions -funwind-tables -fno-rtti -UNDEBUG -std=c++17 -MD -MT lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CFIFixup.cpp.o -MF lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CFIFixup.cpp.o.d -o lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CFIFixup.cpp.o -c /home/botworker/bbot/clang-hip-vega20/llvm-project/llvm/lib/CodeGen/CFIFixup.cpp
/home/botworker/bbot/clang-hip-vega20/llvm-project/llvm/lib/CodeGen/CFIFixup.cpp: In function ‘llvm::SmallVector<BlockFlags> computeBlockInfo(const llvm::MachineFunction&, const llvm::MachineBasicBlock*)’:
/home/botworker/bbot/clang-hip-vega20/llvm-project/llvm/lib/CodeGen/CFIFixup.cpp:174:10: error: could not convert ‘BlockInfo’ from ‘SmallVector<[...],32>’ to ‘SmallVector<[...],40>’
  174 |   return BlockInfo;
      |          ^~~~~~~~~
      |          |
      |          SmallVector<[...],32>
[23/148] Linking CXX executable bin/llvm-ml
[24/148] Linking CXX executable bin/apinotes-test
[25/148] Linking CXX executable bin/llvm-modextract
[26/148] Linking CXX executable bin/llvm-cov
[27/148] Linking CXX executable bin/llvm-as
[28/148] Linking CXX executable bin/llvm-cat
[29/148] Linking CXX executable bin/llvm-profdata
[30/148] Linking CXX executable bin/llvm-ar
[31/148] Linking CXX executable bin/llvm-readobj
[32/148] Linking CXX executable bin/llvm-dwarfdump
[33/148] Linking CXX executable bin/llvm-pdbutil
[34/148] Linking CXX executable bin/llvm-size
[35/148] Linking CXX executable bin/llvm-rtdyld
[36/148] Linking CXX executable bin/llvm-link
[37/148] Linking CXX executable bin/clang-format
[38/148] Linking CXX executable bin/clang-offload-bundler
[39/148] Linking CXX executable bin/clang-apply-replacements
[40/148] Linking CXX executable bin/llvm-nm
[41/148] Linking CXX executable bin/llvm-cfi-verify
[42/148] Linking CXX executable bin/llvm-debuginfo-analyzer
[43/148] Linking CXX executable bin/llvm-objdump
[44/148] Linking CXX executable bin/llvm-profgen
[45/148] Linking CXX executable bin/diagtool
[46/148] Linking CXX shared module lib/SampleAnalyzerPlugin.so
[47/148] Linking CXX shared module lib/CheckerOptionHandlingAnalyzerPlugin.so
[48/148] Linking CXX shared module lib/CheckerDependencyHandlingAnalyzerPlugin.so
[49/148] Linking CXX executable bin/clang-diff
[50/148] Linking CXX executable bin/clang-include-cleaner
[51/148] Linking CXX executable bin/clang-installapi
[52/148] Linking CXX executable bin/clang-reorder-fields
[53/148] Linking CXX executable bin/clang-refactor
Step 7 (Building LLVM) failure: Building LLVM (failure)
...
[13/148] Linking CXX executable bin/llvm-ctxprof-util
[14/148] Linking CXX executable bin/llvm-sim
[15/148] Linking CXX executable bin/llvm-cxxdump
[16/148] Linking CXX executable bin/llvm-ifs
[17/148] Linking CXX executable bin/llvm-mca
[18/148] Linking CXX executable bin/llvm-readtapi
[19/148] Linking CXX executable bin/llvm-debuginfod
[20/148] Linking CXX executable bin/llvm-mc
[21/148] Linking CXX executable bin/llvm-objcopy
[22/148] Building CXX object lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CFIFixup.cpp.o
FAILED: lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CFIFixup.cpp.o 
ccache /usr/bin/c++ -DGTEST_HAS_RTTI=0 -D_DEBUG -D_GLIBCXX_ASSERTIONS -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/home/botworker/bbot/clang-hip-vega20/botworker/clang-hip-vega20/llvm/lib/CodeGen -I/home/botworker/bbot/clang-hip-vega20/llvm-project/llvm/lib/CodeGen -I/home/botworker/bbot/clang-hip-vega20/botworker/clang-hip-vega20/llvm/include -I/home/botworker/bbot/clang-hip-vega20/llvm-project/llvm/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -fno-lifetime-dse -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wimplicit-fallthrough -Wno-uninitialized -Wno-nonnull -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wno-misleading-indentation -Wctad-maybe-unsupported -fdiagnostics-color -ffunction-sections -fdata-sections -O3 -DNDEBUG  -fno-exceptions -funwind-tables -fno-rtti -UNDEBUG -std=c++17 -MD -MT lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CFIFixup.cpp.o -MF lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CFIFixup.cpp.o.d -o lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/CFIFixup.cpp.o -c /home/botworker/bbot/clang-hip-vega20/llvm-project/llvm/lib/CodeGen/CFIFixup.cpp
/home/botworker/bbot/clang-hip-vega20/llvm-project/llvm/lib/CodeGen/CFIFixup.cpp: In function ‘llvm::SmallVector<BlockFlags> computeBlockInfo(const llvm::MachineFunction&, const llvm::MachineBasicBlock*)’:
/home/botworker/bbot/clang-hip-vega20/llvm-project/llvm/lib/CodeGen/CFIFixup.cpp:174:10: error: could not convert ‘BlockInfo’ from ‘SmallVector<[...],32>’ to ‘SmallVector<[...],40>’
  174 |   return BlockInfo;
      |          ^~~~~~~~~
      |          |
      |          SmallVector<[...],32>
[23/148] Linking CXX executable bin/llvm-ml
[24/148] Linking CXX executable bin/apinotes-test
[25/148] Linking CXX executable bin/llvm-modextract
[26/148] Linking CXX executable bin/llvm-cov
[27/148] Linking CXX executable bin/llvm-as
[28/148] Linking CXX executable bin/llvm-cat
[29/148] Linking CXX executable bin/llvm-profdata
[30/148] Linking CXX executable bin/llvm-ar
[31/148] Linking CXX executable bin/llvm-readobj
[32/148] Linking CXX executable bin/llvm-dwarfdump
[33/148] Linking CXX executable bin/llvm-pdbutil
[34/148] Linking CXX executable bin/llvm-size
[35/148] Linking CXX executable bin/llvm-rtdyld
[36/148] Linking CXX executable bin/llvm-link
[37/148] Linking CXX executable bin/clang-format
[38/148] Linking CXX executable bin/clang-offload-bundler
[39/148] Linking CXX executable bin/clang-apply-replacements
[40/148] Linking CXX executable bin/llvm-nm
[41/148] Linking CXX executable bin/llvm-cfi-verify
[42/148] Linking CXX executable bin/llvm-debuginfo-analyzer
[43/148] Linking CXX executable bin/llvm-objdump
[44/148] Linking CXX executable bin/llvm-profgen
[45/148] Linking CXX executable bin/diagtool
[46/148] Linking CXX shared module lib/SampleAnalyzerPlugin.so
[47/148] Linking CXX shared module lib/CheckerOptionHandlingAnalyzerPlugin.so
[48/148] Linking CXX shared module lib/CheckerDependencyHandlingAnalyzerPlugin.so
[49/148] Linking CXX executable bin/clang-diff
[50/148] Linking CXX executable bin/clang-include-cleaner
[51/148] Linking CXX executable bin/clang-installapi
[52/148] Linking CXX executable bin/clang-reorder-fields
[53/148] Linking CXX executable bin/clang-refactor

```

</details>

https://github.com/llvm/llvm-project/pull/125137