[llvm] [Utils] Consolidate `LockstepReverseIterator` into own header (NFC) (PR #116657)

Fri Feb 21 12:46:37 PST 2025

llvm-ci wrote:

LLVM Buildbot has detected a new failure on builder `ml-opt-rel-x86-64` running on `ml-opt-rel-x86-64-b1` while building `llvm` at step 5 "build-unified-tree".

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

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

```
Step 5 (build-unified-tree) failure: build (failure)
...
45.344 [1473/13/2351] Building CXX object lib/Target/RISCV/MCTargetDesc/CMakeFiles/LLVMRISCVDesc.dir/RISCVTargetStreamer.cpp.o
45.344 [1473/12/2352] Building CXX object lib/Target/RISCV/MCTargetDesc/CMakeFiles/LLVMRISCVDesc.dir/RISCVInstPrinter.cpp.o
45.345 [1473/11/2353] Building CXX object lib/Target/RISCV/AsmParser/CMakeFiles/LLVMRISCVAsmParser.dir/RISCVAsmParser.cpp.o
45.363 [1473/10/2354] Building CXX object lib/Target/RISCV/MCTargetDesc/CMakeFiles/LLVMRISCVDesc.dir/RISCVMCTargetDesc.cpp.o
45.397 [1472/10/2355] Linking CXX static library lib/libLLVMRISCVDesc.a
45.412 [1469/12/2356] Linking CXX static library lib/libLLVMRISCVTargetMCA.a
45.413 [1469/11/2357] Linking CXX static library lib/libLLVMRISCVDisassembler.a
45.414 [1469/10/2358] Linking CXX static library lib/libLLVMRISCVAsmParser.a
49.446 [1469/9/2359] Building CXX object lib/Transforms/Scalar/CMakeFiles/LLVMScalarOpts.dir/GVNSink.cpp.o
49.646 [1469/8/2360] Building CXX object lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/SimplifyCFG.cpp.o
FAILED: lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/SimplifyCFG.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/b/ml-opt-rel-x86-64-b1/build/lib/Transforms/Utils -I/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils -I/var/lib/buildbot/.local/lib/python3.7/site-packages/tensorflow/include -I/b/ml-opt-rel-x86-64-b1/build/include -I/b/ml-opt-rel-x86-64-b1/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 -fdiagnostics-color -ffunction-sections -fdata-sections -O3 -DNDEBUG  -fno-exceptions -funwind-tables -fno-rtti -UNDEBUG -std=c++17 -MD -MT lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/SimplifyCFG.cpp.o -MF lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/SimplifyCFG.cpp.o.d -o lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/SimplifyCFG.cpp.o -c /b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp: In function ‘bool sinkCommonCodeFromPredecessors(llvm::BasicBlock*, llvm::DomTreeUpdater*)’:
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:2503:3: error: reference to ‘LockstepReverseIterator’ is ambiguous
 2503 |   LockstepReverseIterator<true> LRI(UnconditionalPreds);
      |   ^~~~~~~~~~~~~~~~~~~~~~~
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1787:7: note: candidates are: ‘class {anonymous}::LockstepReverseIterator’
 1787 | class LockstepReverseIterator {
      |       ^~~~~~~~~~~~~~~~~~~~~~~
In file included from /b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:77:
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/include/llvm/Transforms/Utils/LockstepReverseIterator.h:41:7: note:                 ‘template<bool EarlyFailure> class llvm::LockstepReverseIterator’
   41 | class LockstepReverseIterator
      |       ^~~~~~~~~~~~~~~~~~~~~~~
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:2503:33: error: ‘LRI’ was not declared in this scope
 2503 |   LockstepReverseIterator<true> LRI(UnconditionalPreds);
      |                                 ^~~
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:2533:44: error: reference to ‘LockstepReverseIterator’ is ambiguous
 2533 |     auto ProfitableToSinkInstruction = [&](LockstepReverseIterator<true> &LRI) {
      |                                            ^~~~~~~~~~~~~~~~~~~~~~~
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1787:7: note: candidates are: ‘class {anonymous}::LockstepReverseIterator’
 1787 | class LockstepReverseIterator {
      |       ^~~~~~~~~~~~~~~~~~~~~~~
In file included from /b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:77:
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/include/llvm/Transforms/Utils/LockstepReverseIterator.h:41:7: note:                 ‘template<bool EarlyFailure> class llvm::LockstepReverseIterator’
   41 | class LockstepReverseIterator
      |       ^~~~~~~~~~~~~~~~~~~~~~~
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:2533:44: error: ‘LockstepReverseIterator’ has not been declared
 2533 |     auto ProfitableToSinkInstruction = [&](LockstepReverseIterator<true> &LRI) {
      |                                            ^~~~~~~~~~~~~~~~~~~~~~~
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:2533:67: error: expected ‘,’ or ‘...’ before ‘<’ token
 2533 |     auto ProfitableToSinkInstruction = [&](LockstepReverseIterator<true> &LRI) {
      |                                                                   ^
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp: At global scope:
/b/ml-opt-rel-x86-64-b1/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:2206:13: warning: ‘bool canSinkInstructions(llvm::ArrayRef<llvm::Instruction*>, llvm::DenseMap<const llvm::Use*, llvm::SmallVector<llvm::Value*, 4> >&)’ defined but not used [-Wunused-function]
 2206 | static bool canSinkInstructions(
      |             ^~~~~~~~~~~~~~~~~~~
51.525 [1469/7/2361] Building AMDGPUGenAsmWriter.inc...
53.259 [1469/6/2362] Building AMDGPUGenGlobalISel.inc...
53.996 [1469/5/2363] Building AMDGPUGenDAGISel.inc...

```

</details>

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