replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

llvm-svn: 17697
This commit is contained in:
Chris Lattner 2004-11-12 23:50:44 +00:00
parent 5c1d84c769
commit 5bcca6058a
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/lib/Transforms/Utils/CodeExtractor.cpp
View File

@ -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<Instruction>(outputs[out])->getParent();
if (InvokeInst *Invoke = dyn_cast<InvokeInst>(outputs[out]))
if (InvokeInst *Invoke = dyn_cast<InvokeInst>(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<BasicBlock*, BasicBlock*>::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<Value*> Indices;