6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-21 18:24:23 +00:00
Code Issues Projects Releases Wiki Activity

Don't eliminate a partially redundant load if it's in a landing pad.

Browse Source 
A landing pad can be jumped to only by the unwind edge of an invoke
instruction. If we eliminate a partially redundant load in a landing pad, it
will create a basic block that violates this constraint. It then leads to other
problems down the line if it tries to merge that basic block with the landing
pad. Avoid this by not eliminating the load in a landing pad.

PR17621


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193064 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling
2013-10-21 04:09:17 +00:00
parent 365f4fa6cb
commit 3e033f2923
4 changed files with 210 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Transforms/Utils/Local.cpp
View File

@ -503,19 +503,7 @@ void llvm::MergeBasicBlockIntoOnlyPred(BasicBlock *DestBB, Pass *P) {
// Splice all the instructions from PredBB to DestBB.
PredBB->getTerminator()->eraseFromParent();
// First splice over the PHI nodes.
BasicBlock::iterator PI = PredBB->begin();
while (isa<PHINode>(PI))
++PI;
if (PI != PredBB->begin())
DestBB->getInstList().splice(DestBB->begin(), PredBB->getInstList(),
PredBB->begin(), PI);
// Now splice over the rest of the instructions.
DestBB->getInstList().splice(DestBB->getFirstInsertionPt(),
PredBB->getInstList(), PI, PredBB->end());
DestBB->getInstList().splice(DestBB->begin(), PredBB->getInstList());
if (P) {
DominatorTree *DT = P->getAnalysisIfAvailable<DominatorTree>();
@ -525,7 +513,6 @@ void llvm::MergeBasicBlockIntoOnlyPred(BasicBlock *DestBB, Pass *P) {
DT->eraseNode(PredBB);
}
}
// Nuke BB.
PredBB->eraseFromParent();
}