6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-05-15 16:38:41 +00:00
Code Issues Projects Releases Wiki Activity

Use IRBuilder while simplifying unwind.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131561 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Devang Patel 2011-05-18 20:01:18 +00:00
parent 871f664093
commit d46ba26a6b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ class SimplifyCFGOpt {
bool FoldValueComparisonIntoPredecessors(TerminatorInst *TI); bool FoldValueComparisonIntoPredecessors(TerminatorInst *TI);
bool SimplifyReturn(ReturnInst *RI); bool SimplifyReturn(ReturnInst *RI);
bool SimplifyUnwind(UnwindInst *UI); bool SimplifyUnwind(UnwindInst *UI, IRBuilder<> &Builder);
bool SimplifyUnreachable(UnreachableInst *UI); bool SimplifyUnreachable(UnreachableInst *UI);
bool SimplifySwitch(SwitchInst *SI); bool SimplifySwitch(SwitchInst *SI);
bool SimplifyIndirectBr(IndirectBrInst *IBI); bool SimplifyIndirectBr(IndirectBrInst *IBI);
@ -2175,7 +2175,7 @@ bool SimplifyCFGOpt::SimplifyReturn(ReturnInst *RI) {
return false; return false;
} }
bool SimplifyCFGOpt::SimplifyUnwind(UnwindInst *UI) { bool SimplifyCFGOpt::SimplifyUnwind(UnwindInst *UI, IRBuilder<> &Builder) {
// Check to see if the first instruction in this block is just an unwind. // Check to see if the first instruction in this block is just an unwind.
// If so, replace any invoke instructions which use this as an exception // If so, replace any invoke instructions which use this as an exception
// destination with call instructions. // destination with call instructions.
@ -2190,14 +2190,16 @@ bool SimplifyCFGOpt::SimplifyUnwind(UnwindInst *UI) {
if (II && II->getUnwindDest() == BB) { if (II && II->getUnwindDest() == BB) {
// Insert a new branch instruction before the invoke, because this // Insert a new branch instruction before the invoke, because this
// is now a fall through. // is now a fall through.
BranchInst *BI = BranchInst::Create(II->getNormalDest(), II); Builder.SetInsertPoint(II);
BranchInst *BI = Builder.CreateBr(II->getNormalDest());
Pred->getInstList().remove(II); // Take out of symbol table Pred->getInstList().remove(II); // Take out of symbol table
// Insert the call now. // Insert the call now.
SmallVector<Value*,8> Args(II->op_begin(), II->op_end()-3); SmallVector<Value*,8> Args(II->op_begin(), II->op_end()-3);
CallInst *CI = CallInst::Create(II->getCalledValue(), Builder.SetInsertPoint(BI);
CallInst *CI = Builder.CreateCall(II->getCalledValue(),
Args.begin(), Args.end(), Args.begin(), Args.end(),
II->getName(), BI); II->getName());
CI->setCallingConv(II->getCallingConv()); CI->setCallingConv(II->getCallingConv());
CI->setAttributes(II->getAttributes()); CI->setAttributes(II->getAttributes());
// If the invoke produced a value, the Call now does instead. // If the invoke produced a value, the Call now does instead.
@ -2671,7 +2673,7 @@ bool SimplifyCFGOpt::run(BasicBlock *BB) {
dyn_cast<UnreachableInst>(BB->getTerminator())) { dyn_cast<UnreachableInst>(BB->getTerminator())) {
if (SimplifyUnreachable(UI)) return true; if (SimplifyUnreachable(UI)) return true;
} else if (UnwindInst *UI = dyn_cast<UnwindInst>(BB->getTerminator())) { } else if (UnwindInst *UI = dyn_cast<UnwindInst>(BB->getTerminator())) {
if (SimplifyUnwind(UI)) return true; if (SimplifyUnwind(UI, Builder)) return true;
} else if (IndirectBrInst *IBI = } else if (IndirectBrInst *IBI =
dyn_cast<IndirectBrInst>(BB->getTerminator())) { dyn_cast<IndirectBrInst>(BB->getTerminator())) {
if (SimplifyIndirectBr(IBI)) return true; if (SimplifyIndirectBr(IBI)) return true;