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

Fri Feb 21 12:35:29 PST 2025

llvm-ci wrote:

LLVM Buildbot has detected a new failure on builder `llvm-clang-x86_64-sie-ubuntu-fast` running on `sie-linux-worker` while building `llvm` at step 5 "build-unified-tree".

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

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

```
Step 5 (build-unified-tree) failure: build (failure)
...
2.898 [77/13/45] Linking CXX executable bin/llvm-rtdyld
2.901 [77/12/46] Generating ../../bin/llvm-otool
2.903 [77/11/47] Linking CXX executable bin/obj2yaml
2.919 [77/10/48] Linking CXX executable bin/llvm-readtapi
2.922 [77/9/49] Linking CXX executable bin/sanstats
2.925 [77/8/50] Linking CXX executable bin/llvm-debuginfo-analyzer
2.930 [77/7/51] Linking CXX executable bin/sancov
2.973 [77/6/52] Linking CXX executable bin/llvm-cfi-verify
2.979 [77/5/53] Linking CXX executable bin/llvm-xray
4.451 [77/4/54] Building CXX object lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/SimplifyCFG.cpp.o
FAILED: lib/Transforms/Utils/CMakeFiles/LLVMTransformUtils.dir/SimplifyCFG.cpp.o 
CCACHE_CPP2=yes CCACHE_HASHDIR=yes /usr/bin/ccache /usr/bin/g++ -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/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/build/lib/Transforms/Utils -I/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils -I/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/build/include -I/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/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/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 /home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp: In function ‘bool sinkCommonCodeFromPredecessors(llvm::BasicBlock*, llvm::DomTreeUpdater*)’:
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:2503:3: error: reference to ‘LockstepReverseIterator’ is ambiguous
 2503 |   LockstepReverseIterator<true> LRI(UnconditionalPreds);
      |   ^~~~~~~~~~~~~~~~~~~~~~~
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1787:7: note: candidates are: ‘class {anonymous}::LockstepReverseIterator’
 1787 | class LockstepReverseIterator {
      |       ^~~~~~~~~~~~~~~~~~~~~~~
In file included from /home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:77:
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/include/llvm/Transforms/Utils/LockstepReverseIterator.h:41:7: note:                 ‘template<bool EarlyFailure> class llvm::LockstepReverseIterator’
   41 | class LockstepReverseIterator
      |       ^~~~~~~~~~~~~~~~~~~~~~~
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:2503:33: error: ‘LRI’ was not declared in this scope
 2503 |   LockstepReverseIterator<true> LRI(UnconditionalPreds);
      |                                 ^~~
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:2533:44: error: reference to ‘LockstepReverseIterator’ is ambiguous
 2533 |     auto ProfitableToSinkInstruction = [&](LockstepReverseIterator<true> &LRI) {
      |                                            ^~~~~~~~~~~~~~~~~~~~~~~
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1787:7: note: candidates are: ‘class {anonymous}::LockstepReverseIterator’
 1787 | class LockstepReverseIterator {
      |       ^~~~~~~~~~~~~~~~~~~~~~~
In file included from /home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:77:
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/include/llvm/Transforms/Utils/LockstepReverseIterator.h:41:7: note:                 ‘template<bool EarlyFailure> class llvm::LockstepReverseIterator’
   41 | class LockstepReverseIterator
      |       ^~~~~~~~~~~~~~~~~~~~~~~
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:2533:44: error: ‘LockstepReverseIterator’ has not been declared
 2533 |     auto ProfitableToSinkInstruction = [&](LockstepReverseIterator<true> &LRI) {
      |                                            ^~~~~~~~~~~~~~~~~~~~~~~
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp:2533:67: error: expected ‘,’ or ‘...’ before ‘<’ token
 2533 |     auto ProfitableToSinkInstruction = [&](LockstepReverseIterator<true> &LRI) {
      |                                                                   ^
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/llvm-project/llvm/lib/Transforms/Utils/SimplifyCFG.cpp: At global scope:
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/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(
      |             ^~~~~~~~~~~~~~~~~~~
4.518 [77/3/55] Building CXX object lib/Transforms/Scalar/CMakeFiles/LLVMScalarOpts.dir/GVNSink.cpp.o
11.848 [77/2/56] Building CXX object lib/CodeGen/AsmPrinter/CMakeFiles/LLVMAsmPrinter.dir/AsmPrinter.cpp.o
12.401 [77/1/57] Building CXX object lib/LTO/CMakeFiles/LLVMLTO.dir/LTO.cpp.o

```

</details>

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