From a5affdcf4cdae48ce1e20a42f8dec6fb6f1c3495 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 18 Mar 2009 16:48:45 +0000 Subject: [PATCH] aha, DAE does have to think about PHI nodes. Many thanks to "Dr Evil" (aka Duncan) for pointing this out :) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67212 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/DeadArgumentElimination.cpp | 6 +++--- test/Transforms/DeadArgElim/2009-03-17-MRE-Invoke.ll | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/Transforms/IPO/DeadArgumentElimination.cpp b/lib/Transforms/IPO/DeadArgumentElimination.cpp index ab8df698457..666db7e8d74 100644 --- a/lib/Transforms/IPO/DeadArgumentElimination.cpp +++ b/lib/Transforms/IPO/DeadArgumentElimination.cpp @@ -803,9 +803,9 @@ bool DAE::RemoveDeadStuffFromFunction(Function *F) { " must have been a struct!"); Instruction *InsertPt = Call; if (InvokeInst *II = dyn_cast(Call)) { - InsertPt = II->getNormalDest()->begin(); - assert(!isa(InsertPt) && - "Can't have a use of the invoke value if the edge is critical"); + BasicBlock::iterator IP = II->getNormalDest()->begin(); + while (isa(IP)) ++IP; + InsertPt = IP; } // We used to return a struct. Instead of doing smart stuff with all the diff --git a/test/Transforms/DeadArgElim/2009-03-17-MRE-Invoke.ll b/test/Transforms/DeadArgElim/2009-03-17-MRE-Invoke.ll index 6ccaa9fc005..f5f2ce18b6c 100644 --- a/test/Transforms/DeadArgElim/2009-03-17-MRE-Invoke.ll +++ b/test/Transforms/DeadArgElim/2009-03-17-MRE-Invoke.ll @@ -13,3 +13,14 @@ T: T2: unreachable } + +define i32 @bar2() { +entry: + %x = invoke {i32,i32} @foo() to label %T unwind label %T2 +T: + %PN = phi i32 [0, %entry] + %y = extractvalue {i32,i32} %x, 1 + ret i32 %y +T2: + unreachable +} \ No newline at end of file