diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-08-02 08:06:43 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-08-02 08:06:43 +0000 |
| commit | 9096968de59c00d7bd3be5ece0971b194a51a65d (patch) | |
| tree | 9cdffefc51f8d0618ae1a6ab6f41465bde4a6475 /llvm/lib | |
| parent | 8344be840733f5ab9ec1927fb374fda7a0e2598e (diff) | |
| download | bcm5719-llvm-9096968de59c00d7bd3be5ece0971b194a51a65d.tar.gz bcm5719-llvm-9096968de59c00d7bd3be5ece0971b194a51a65d.zip | |
Fix dereferencing end iterator in SimplifyCFG. Patch by Ye Mei.
llvm-svn: 187646
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 427688fc8e1..d48213ff6e3 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -4290,7 +4290,8 @@ bool SimplifyCFGOpt::SimplifyParallelAndOr(BasicBlock *BB, IRBuilder<> &Builder, // Do the transformation. BasicBlock *CB; bool Iteration = true; - BasicBlock::iterator ItOld = Builder.GetInsertPoint(); + BasicBlock *SaveInsertBB = Builder.GetInsertBlock(); + BasicBlock::iterator SaveInsertPt = Builder.GetInsertPoint(); BranchInst *PBI = dyn_cast<BranchInst>(FirstCondBlock->getTerminator()); Value *PC = PBI->getCondition(); do { @@ -4319,8 +4320,8 @@ bool SimplifyCFGOpt::SimplifyParallelAndOr(BasicBlock *BB, IRBuilder<> &Builder, // make CB unreachable and let downstream to delete the block. new UnreachableInst(CB->getContext(), CB); } while (Iteration); - - Builder.SetInsertPoint(ItOld); + if (SaveInsertBB) + Builder.SetInsertPoint(SaveInsertBB, SaveInsertPt); DEBUG(dbgs() << "Use parallel and/or in:\n" << *FirstCondBlock); return true; } @@ -4454,11 +4455,13 @@ bool SimplifyCFGOpt::MergeIfRegion(BasicBlock *BB, IRBuilder<> &Builder, FirstEntryBlock->getInstList().splice(FirstEntryBlock->end(), SecondEntryBlock->getInstList()); BranchInst *PBI = dyn_cast<BranchInst>(FirstEntryBlock->getTerminator()); Value *CC = PBI->getCondition(); - BasicBlock::iterator ItOld = Builder.GetInsertPoint(); + BasicBlock *SaveInsertBB = Builder.GetInsertBlock(); + BasicBlock::iterator SaveInsertPt = Builder.GetInsertPoint(); Builder.SetInsertPoint(PBI); Value *NC = Builder.CreateOr(CInst1, CC); PBI->replaceUsesOfWith(CC, NC); - Builder.SetInsertPoint(ItOld); + if (SaveInsertBB) + Builder.SetInsertPoint(SaveInsertBB, SaveInsertPt); // Remove IfTrue1 if (IfTrue1 != FirstEntryBlock) { |
