From db96ae9607ddca2e0627c8b87a160d61689663ca Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Sun, 9 Mar 2008 07:36:38 +0000 Subject: [PATCH] A BB that unwind_to an "unwind" inst is that same as one that doesn't unwind_to at all. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48096 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/SimplifyCFG.cpp | 5 ++++- test/Transforms/SimplifyCFG/unwindto.ll | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 61da0d998fc..846c3bf9d9a 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1370,7 +1370,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { new UnwindInst(Pred); // Use unwind. Changed = true; } - } else if (InvokeInst *II = dyn_cast(Pred->getTerminator())) + } else if (InvokeInst *II = dyn_cast(Pred->getTerminator())) { if (II->getUnwindDest() == BB) { // Insert a new branch instruction before the invoke, because this // is now a fall through... @@ -1388,6 +1388,9 @@ bool llvm::SimplifyCFG(BasicBlock *BB) { delete II; Changed = true; } + } else if (Pred->getUnwindDest() == BB) { + Pred->setUnwindDest(NULL); + } Preds.pop_back(); } diff --git a/test/Transforms/SimplifyCFG/unwindto.ll b/test/Transforms/SimplifyCFG/unwindto.ll index e42a831766c..28d9d1e6e39 100644 --- a/test/Transforms/SimplifyCFG/unwindto.ll +++ b/test/Transforms/SimplifyCFG/unwindto.ll @@ -33,3 +33,11 @@ bb4: unwind_to %cleanup cleanup: ret i32 1 } + +define i32 @f3() { +entry: unwind_to %cleanup + call void @g(i32 0) + ret i32 0 +cleanup: + unwind +} -- 2.11.0