[llvm-commits] [llvm] r67212 - in /llvm/trunk: lib/Transforms/IPO/DeadArgumentElimination.cpp test/Transforms/DeadArgElim/2009-03-17-MRE-Invoke.ll

[Chris Lattner]

Author: lattner
Date: Wed Mar 18 11:48:45 2009
New Revision: 67212

URL: http://llvm.org/viewvc/llvm-project?rev=67212&view=rev
Log:
aha, DAE does have to think about PHI nodes.  Many thanks to "Dr Evil" (aka Duncan)
for pointing this out :)

Modified:
    llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
    llvm/trunk/test/Transforms/DeadArgElim/2009-03-17-MRE-Invoke.ll

Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=67212&r1=67211&r2=67212&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Wed Mar 18 11:48:45 2009
@@ -803,9 +803,9 @@
                " must have been a struct!");
         Instruction *InsertPt = Call;
         if (InvokeInst *II = dyn_cast<InvokeInst>(Call)) {
-          InsertPt = II->getNormalDest()->begin();
-          assert(!isa<PHINode>(InsertPt) &&
-                "Can't have a use of the invoke value if the edge is critical");
+          BasicBlock::iterator IP = II->getNormalDest()->begin();
+          while (isa<PHINode>(IP)) ++IP;
+          InsertPt = IP;
         }
           
         // We used to return a struct. Instead of doing smart stuff with all the

Modified: llvm/trunk/test/Transforms/DeadArgElim/2009-03-17-MRE-Invoke.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/2009-03-17-MRE-Invoke.ll?rev=67212&r1=67211&r2=67212&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/DeadArgElim/2009-03-17-MRE-Invoke.ll (original)
+++ llvm/trunk/test/Transforms/DeadArgElim/2009-03-17-MRE-Invoke.ll Wed Mar 18 11:48:45 2009
@@ -13,3 +13,14 @@
 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