diff options
author | Tanya Lattner <tonic@nondot.org> | 2009-02-17 19:33:52 +0000 |
---|---|---|
committer | Tanya Lattner <tonic@nondot.org> | 2009-02-17 19:33:52 +0000 |
commit | 41b57f5044c9e9e737ff20f55dc980026f4152f7 (patch) | |
tree | f51823abd015ea6680627068915fd7f6cd4ba268 | |
parent | 3bf2b5ea6fe27c2528354f40dab3ed39bdb35f89 (diff) | |
download | llvm-41b57f5044c9e9e737ff20f55dc980026f4152f7.tar.gz |
Merge 64582 from mainline
Fix PR3522. It's not safe to sink into landing pad BB's.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_25@64790 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/CodeGen/MachineSink.cpp | 5 | ||||
-rw-r--r-- | test/CodeGen/X86/pr3522.ll | 30 |
2 files changed, 35 insertions, 0 deletions
diff --git a/lib/CodeGen/MachineSink.cpp b/lib/CodeGen/MachineSink.cpp index 87114396f9e5..23bb900b9949 100644 --- a/lib/CodeGen/MachineSink.cpp +++ b/lib/CodeGen/MachineSink.cpp @@ -208,6 +208,11 @@ bool MachineSinking::SinkInstruction(MachineInstr *MI, bool &SawStore) { // 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); diff --git a/test/CodeGen/X86/pr3522.ll b/test/CodeGen/X86/pr3522.ll new file mode 100644 index 000000000000..f743700fd251 --- /dev/null +++ b/test/CodeGen/X86/pr3522.ll @@ -0,0 +1,30 @@ +; RUN: llvm-as < %s | llc -march=x86 -stats |& not grep machine-sink +; PR3522 + +target triple = "i386-pc-linux-gnu" +@.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) |