From 68c311aac64ca3bc50f48f4f1b4fd4c21fe0c4df Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 12 Nov 2004 23:50:44 +0000 Subject: [PATCH] Fix a bug where the code extractor would get a bit confused handling invoke instructions, setting DefBlock to a block it did not have dom info for. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17697 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/CodeExtractor.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/Transforms/Utils/CodeExtractor.cpp b/lib/Transforms/Utils/CodeExtractor.cpp index 2b7eb0093fe..ebdc0542020 100644 --- a/lib/Transforms/Utils/CodeExtractor.cpp +++ b/lib/Transforms/Utils/CodeExtractor.cpp @@ -488,8 +488,20 @@ emitCallAndSwitchStatement(Function *newFunction, BasicBlock *codeReplacer, // For an invoke, the normal destination is the only one that is // dominated by the result of the invocation BasicBlock *DefBlock = cast(outputs[out])->getParent(); - if (InvokeInst *Invoke = dyn_cast(outputs[out])) + if (InvokeInst *Invoke = dyn_cast(outputs[out])) { DefBlock = Invoke->getNormalDest(); + + // Make sure we are looking at the original successor block, not + // at a newly inserted exit block, which won't be in the dominator + // info. + for (std::map::iterator I = + ExitBlockMap.begin(), E = ExitBlockMap.end(); I != E; ++I) + if (DefBlock == I->second) { + DefBlock = I->first; + break; + } + } + if (!DS || DS->dominates(DefBlock, TI->getParent())) if (AggregateArgs) { std::vector Indices;