diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2015-07-10 07:15:17 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2015-07-10 07:15:17 +0000 |
| commit | db82d2f33827dc44dc0076ad26a1a0f4638719c5 (patch) | |
| tree | 426d1932604bec0dc540456540d91402c644e66a /llvm/lib/Transforms/Utils/BasicBlockUtils.cpp | |
| parent | 0f70ee9017d080e5a068647a8e3717c483c4c51b (diff) | |
| download | bcm5719-llvm-db82d2f33827dc44dc0076ad26a1a0f4638719c5.tar.gz bcm5719-llvm-db82d2f33827dc44dc0076ad26a1a0f4638719c5.zip | |
Revert the new EH instructions
This reverts commits r241888-r241891, I didn't mean to commit them.
llvm-svn: 241893
Diffstat (limited to 'llvm/lib/Transforms/Utils/BasicBlockUtils.cpp')
| -rw-r--r-- | llvm/lib/Transforms/Utils/BasicBlockUtils.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp index c761934162d..53471de6154 100644 --- a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp +++ b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp @@ -119,9 +119,8 @@ bool llvm::MergeBlockIntoPredecessor(BasicBlock *BB, DominatorTree *DT, // Don't break self-loops. if (PredBB == BB) return false; - // Don't break unwinding instructions. - if (PredBB->getTerminator()->isExceptional()) - return false; + // Don't break invokes. + if (isa<InvokeInst>(PredBB->getTerminator())) return false; succ_iterator SI(succ_begin(PredBB)), SE(succ_end(PredBB)); BasicBlock *OnlySucc = BB; |
