diff --git a/mlir/lib/Transforms/Inliner.cpp b/mlir/lib/Transforms/Inliner.cpp --- a/mlir/lib/Transforms/Inliner.cpp +++ b/mlir/lib/Transforms/Inliner.cpp @@ -435,7 +435,7 @@ auto &calls = inliner.calls; // A set of dead nodes to remove after inlining. - SmallVector deadNodes; + llvm::SmallSetVector deadNodes; // Collect all of the direct calls within the nodes of the current SCC. We // don't traverse nested callgraph nodes, because they are handled separately @@ -446,7 +446,7 @@ // Don't collect calls if the node is already dead. if (useList.isDead(node)) { - deadNodes.push_back(node); + deadNodes.insert(node); } else { collectCallOps(*node->getCallableRegion(), node, cg, inliner.symbolTable, calls, /*traverseNestedCGNodes=*/false); @@ -457,6 +457,8 @@ // here as more calls may be added during inlining. bool inlinedAnyCalls = false; for (unsigned i = 0; i != calls.size(); ++i) { + if (deadNodes.contains(calls[i].sourceNode)) + continue; ResolvedCall it = calls[i]; bool doInline = shouldInline(it); CallOpInterface call = it.call; @@ -493,7 +495,7 @@ // If we inlined in place, mark the node for deletion. if (inlineInPlace) { useList.eraseNode(it.targetNode); - deadNodes.push_back(it.targetNode); + deadNodes.insert(it.targetNode); } } diff --git a/mlir/test/Transforms/inlining-repeated-use.mlir b/mlir/test/Transforms/inlining-repeated-use.mlir new file mode 100644 --- /dev/null +++ b/mlir/test/Transforms/inlining-repeated-use.mlir @@ -0,0 +1,48 @@ +// RUN: mlir-opt -inline %s | FileCheck %s + +// This could crash the inliner, make sure it does not. + +func @A() { + call @B() { inA } : () -> () + return +} + +func @B() { + call @E() : () -> () + return +} + +func @C() { + call @D() : () -> () + return +} + +func private @D() { + call @B() { inD } : () -> () + return +} + +func @E() { + call @fabsf() : () -> () + return +} + +func private @fabsf() + +// CHECK: func @A() { +// CHECK: call @fabsf() : () -> () +// CHECK: return +// CHECK: } +// CHECK: func @B() { +// CHECK: call @fabsf() : () -> () +// CHECK: return +// CHECK: } +// CHECK: func @C() { +// CHECK: call @fabsf() : () -> () +// CHECK: return +// CHECK: } +// CHECK: func @E() { +// CHECK: call @fabsf() : () -> () +// CHECK: return +// CHECK: } +// CHECK: func private @fabsf()