[llvm-commits] [llvm] r64582 - in /llvm/trunk: lib/CodeGen/MachineSink.cpp test/CodeGen/X86/pr3522.ll

[Evan Cheng]

Author: evancheng
Date: Sun Feb 15 02:36:12 2009
New Revision: 64582

URL: http://llvm.org/viewvc/llvm-project?rev=64582&view=rev
Log:
Fix PR3522. It's not safe to sink into landing pad BB's.

Added:
    llvm/trunk/test/CodeGen/X86/pr3522.ll
Modified:
    llvm/trunk/lib/CodeGen/MachineSink.cpp

Modified: llvm/trunk/lib/CodeGen/MachineSink.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineSink.cpp?rev=64582&r1=64581&r2=64582&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineSink.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineSink.cpp Sun Feb 15 02:36:12 2009
@@ -212,6 +212,11 @@
   // If there are no outputs, it must have side-effects.
   if (SuccToSinkTo == 0)
     return false;
+
+  // It's not safe to sink instructions to EH landing pad. Control flow into
+  // landing pad is implicitly defined.
+  if (SuccToSinkTo->isLandingPad())
+    return false;
   
   DEBUG(cerr << "Sink instr " << *MI);
   DEBUG(cerr << "to block " << *SuccToSinkTo);

Added: llvm/trunk/test/CodeGen/X86/pr3522.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr3522.ll?rev=64582&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/pr3522.ll (added)
+++ llvm/trunk/test/CodeGen/X86/pr3522.ll Sun Feb 15 02:36:12 2009
@@ -0,0 +1,30 @@
+; RUN: llvm-as < %s | llc -march=x86 -stats |& not grep machine-sink
+; PR3522
+
+target triple = "i386-pc-linux-gnu"
+ at .str = external constant [13 x i8]		; <[13 x i8]*> [#uses=1]
+
+define void @_ada_c34018a() {
+entry:
+	%0 = tail call i32 @report__ident_int(i32 90)		; <i32> [#uses=1]
+	%1 = trunc i32 %0 to i8		; <i8> [#uses=1]
+	invoke void @__gnat_rcheck_12(i8* getelementptr ([13 x i8]* @.str, i32 0, i32 0), i32 32) noreturn
+			to label %invcont unwind label %lpad
+
+invcont:		; preds = %entry
+	unreachable
+
+bb22:		; preds = %lpad
+	ret void
+
+return:		; preds = %lpad
+	ret void
+
+lpad:		; preds = %entry
+	%2 = icmp eq i8 %1, 90		; <i1> [#uses=1]
+	br i1 %2, label %return, label %bb22
+}
+
+declare void @__gnat_rcheck_12(i8*, i32) noreturn
+
+declare i32 @report__ident_int(i32)