Remove 'unwinds to' support from mainline. This patch undoes r47802 r47989
r48047 r48084 r48085 r48086 r48088 r48096 r48099 r48109 and r48123.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@50265 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/IPO/PruneEH.cpp b/lib/Transforms/IPO/PruneEH.cpp
index 1b9aefc..0181605 100644
--- a/lib/Transforms/IPO/PruneEH.cpp
+++ b/lib/Transforms/IPO/PruneEH.cpp
@@ -31,7 +31,6 @@
STATISTIC(NumRemoved, "Number of invokes removed");
STATISTIC(NumUnreach, "Number of noreturn calls optimized");
-STATISTIC(NumBBUnwind, "Number of unwind dest removed from blocks");
namespace {
struct VISIBILITY_HIDDEN PruneEH : public CallGraphSCCPass {
@@ -152,8 +151,6 @@
bool PruneEH::SimplifyFunction(Function *F) {
bool MadeChange = false;
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
- bool couldUnwind = false;
-
if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator()))
if (II->doesNotThrow()) {
SmallVector<Value*, 8> Args(II->op_begin()+3, II->op_end());
@@ -183,12 +180,10 @@
++NumRemoved;
MadeChange = true;
- } else {
- couldUnwind = true;
}
for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; )
- if (CallInst *CI = dyn_cast<CallInst>(I++)) {
+ if (CallInst *CI = dyn_cast<CallInst>(I++))
if (CI->doesNotReturn() && !isa<UnreachableInst>(I)) {
// This call calls a function that cannot return. Insert an
// unreachable instruction after it and simplify the code. Do this
@@ -204,19 +199,9 @@
MadeChange = true;
++NumUnreach;
break;
- } else if (!CI->doesNotThrow()) {
- couldUnwind = true;
}
- }
-
- // Strip 'unwindTo' off of BBs that have no calls/invokes without nounwind.
- if (!couldUnwind && BB->getUnwindDest()) {
- MadeChange = true;
- ++NumBBUnwind;
- BB->getUnwindDest()->removePredecessor(BB, false, true);
- BB->setUnwindDest(NULL);
- }
}
+
return MadeChange;
}