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

Update the inliner and simplifycfg to handle unwind_to.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48086 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky
2008-03-09 05:10:13 +00:00
parent c6694228fa
commit 6af31aab63
4 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Transforms/Utils/SimplifyCFG.cpp
View File

@ -1237,6 +1237,8 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
SmallVector<BasicBlock*, 8> UncondBranchPreds;
SmallVector<BranchInst*, 8> CondBranchPreds;
for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI) {
if ((*PI)->getUnwindDest() == BB) continue;
TerminatorInst *PTI = (*PI)->getTerminator();
if (BranchInst *BI = dyn_cast<BranchInst>(PTI)) {
if (BI->isUnconditional())
@ -1788,6 +1790,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
BasicBlock *OnlySucc = 0;
if (OnlyPred && OnlyPred != BB && // Don't break self loops
OnlyPred->getUnwindDest() != BB &&
OnlyPred->getTerminator()->getOpcode() != Instruction::Invoke) {
// Check to see if there is only one distinct successor...
succ_iterator SI(succ_begin(OnlyPred)), SE(succ_end(OnlyPred));
@ -1799,7 +1802,8 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
}
}
if (OnlySucc) {
if (OnlySucc && (BB->getUnwindDest() == OnlyPred->getUnwindDest() ||
!BB->getUnwindDest() || !OnlyPred->getUnwindDest())) {
DOUT << "Merging: " << *BB << "into: " << *OnlyPred;
// Resolve any PHI nodes at the start of the block. They are all
@ -1819,6 +1823,10 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
// Move all definitions in the successor to the predecessor.
OnlyPred->getInstList().splice(OnlyPred->end(), BB->getInstList());
// Move the unwind_to block
if (!OnlyPred->getUnwindDest() && BB->getUnwindDest())
OnlyPred->setUnwindDest(BB->getUnwindDest());
// Make all PHI nodes that referred to BB now refer to Pred as their
// source.
BB->replaceAllUsesWith(OnlyPred);