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

Fix dereferencing end iterator in SimplifyCFG. Patch by Ye Mei.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187646 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alexey Samsonov 2013-08-02 08:06:43 +00:00
parent ee1d7db74b
commit e393b73808
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4290,7 +4290,8 @@ bool SimplifyCFGOpt::SimplifyParallelAndOr(BasicBlock *BB, IRBuilder<> &Builder,
// Do the transformation. // Do the transformation.
BasicBlock *CB; BasicBlock *CB;
bool Iteration = true; bool Iteration = true;
BasicBlock::iterator ItOld = Builder.GetInsertPoint(); BasicBlock *SaveInsertBB = Builder.GetInsertBlock();
BasicBlock::iterator SaveInsertPt = Builder.GetInsertPoint();
BranchInst *PBI = dyn_cast<BranchInst>(FirstCondBlock->getTerminator()); BranchInst *PBI = dyn_cast<BranchInst>(FirstCondBlock->getTerminator());
Value *PC = PBI->getCondition(); Value *PC = PBI->getCondition();
do { do {
@ -4319,8 +4320,8 @@ bool SimplifyCFGOpt::SimplifyParallelAndOr(BasicBlock *BB, IRBuilder<> &Builder,
// make CB unreachable and let downstream to delete the block. // make CB unreachable and let downstream to delete the block.
new UnreachableInst(CB->getContext(), CB); new UnreachableInst(CB->getContext(), CB);
} while (Iteration); } while (Iteration);
if (SaveInsertBB)
Builder.SetInsertPoint(ItOld); Builder.SetInsertPoint(SaveInsertBB, SaveInsertPt);
DEBUG(dbgs() << "Use parallel and/or in:\n" << *FirstCondBlock); DEBUG(dbgs() << "Use parallel and/or in:\n" << *FirstCondBlock);
return true; return true;
} }
@ -4454,11 +4455,13 @@ bool SimplifyCFGOpt::MergeIfRegion(BasicBlock *BB, IRBuilder<> &Builder,
FirstEntryBlock->getInstList().splice(FirstEntryBlock->end(), SecondEntryBlock->getInstList()); FirstEntryBlock->getInstList().splice(FirstEntryBlock->end(), SecondEntryBlock->getInstList());
BranchInst *PBI = dyn_cast<BranchInst>(FirstEntryBlock->getTerminator()); BranchInst *PBI = dyn_cast<BranchInst>(FirstEntryBlock->getTerminator());
Value *CC = PBI->getCondition(); Value *CC = PBI->getCondition();
BasicBlock::iterator ItOld = Builder.GetInsertPoint(); BasicBlock *SaveInsertBB = Builder.GetInsertBlock();
BasicBlock::iterator SaveInsertPt = Builder.GetInsertPoint();
Builder.SetInsertPoint(PBI); Builder.SetInsertPoint(PBI);
Value *NC = Builder.CreateOr(CInst1, CC); Value *NC = Builder.CreateOr(CInst1, CC);
PBI->replaceUsesOfWith(CC, NC); PBI->replaceUsesOfWith(CC, NC);
Builder.SetInsertPoint(ItOld); if (SaveInsertBB)
Builder.SetInsertPoint(SaveInsertBB, SaveInsertPt);
// Remove IfTrue1 // Remove IfTrue1
if (IfTrue1 != FirstEntryBlock) { if (IfTrue1 != FirstEntryBlock) {