Doomhowl-Interactive/llvm-project
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

[MLIR] Fix walk() after PostOrderTraversal change (#191357)

Browse Source 
make_early_inc_range doesn't keep the range alive, only the iterators.
This breaks with the recent PostOrderTraversal change, which no longer
stores the state in the iterators. Store the range in a variable to keep
it alive for the entire loop.

Fixup of #191047 / 691a130e0f.
This commit is contained in:
Alexis Engelke
2026-04-10 10:20:05 +02:00
committed by GitHub
parent bccb951e84
commit 9f9f0dcbe2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mlir/include/mlir/IR/Visitors.h
View File

@@ -120,8 +120,9 @@ void walk(Operation *op, function_ref<void(Block *)> callback,
WalkOrder order) {
for (auto &region : Iterator::makeIterable(*op)) {
// Early increment here in the case where the block is erased.
for (auto &block :
llvm::make_early_inc_range(Iterator::makeIterable(region))) {
// PostOrderTraversal keeps state outside of iterators, so store it here.
auto &&It = Iterator::makeIterable(region);
for (auto &block : llvm::make_early_inc_range(It)) {
if (order == WalkOrder::PreOrder)
callback(&block);
for (auto &nestedOp : Iterator::makeIterable(block))
@@ -195,8 +196,9 @@ WalkResult walk(Operation *op, function_ref<WalkResult(Block *)> callback,
WalkOrder order) {
for (auto &region : Iterator::makeIterable(*op)) {
// Early increment here in the case where the block is erased.
for (auto &block :
llvm::make_early_inc_range(Iterator::makeIterable(region))) {
// PostOrderTraversal keeps state outside of iterators, so store it here.
auto &&It = Iterator::makeIterable(region);
for (auto &block : llvm::make_early_inc_range(It)) {
if (order == WalkOrder::PreOrder) {
WalkResult result = callback(&block);
if (result.wasSkipped())