summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2011-05-29 19:50:32 +0000
committerJohn McCall <rjmccall@apple.com>2011-05-29 19:50:32 +0000
commit7d84ece09bf8364895498a4f591a6f56811ba4e6 (patch)
tree2542d6ea13d0f0677f33bbe35de1d6a269ae9ee0
parentbe6d0c0aea800a98b517adb223f3830b4ea150d2 (diff)
downloadbcm5719-llvm-7d84ece09bf8364895498a4f591a6f56811ba4e6.tar.gz
bcm5719-llvm-7d84ece09bf8364895498a4f591a6f56811ba4e6.zip
On Darwin ARM, set the UNWIND_RESUME libcall to _Unwind_SjLj_Resume.
This is important for the correct lowering of unwind instructions (which doesn't matter at all) and llvm.eh.resume calls (which does). Take 2, now with more basic competence. llvm-svn: 132295
-rw-r--r--llvm/lib/Target/ARM/ARMISelLowering.cpp1
-rw-r--r--llvm/test/CodeGen/ARM/eh-resume-darwin.ll29
2 files changed, 30 insertions, 0 deletions
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
index a78c3ed2a4a..1e90d422bd3 100644
--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
+++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp
@@ -656,6 +656,7 @@ ARMTargetLowering::ARMTargetLowering(TargetMachine &TM)
setOperationAction(ISD::EH_SJLJ_SETJMP, MVT::i32, Custom);
setOperationAction(ISD::EH_SJLJ_LONGJMP, MVT::Other, Custom);
setOperationAction(ISD::EH_SJLJ_DISPATCHSETUP, MVT::Other, Custom);
+ setLibcallName(RTLIB::UNWIND_RESUME, "_Unwind_SjLj_Resume");
}
setOperationAction(ISD::SETCC, MVT::i32, Expand);
diff --git a/llvm/test/CodeGen/ARM/eh-resume-darwin.ll b/llvm/test/CodeGen/ARM/eh-resume-darwin.ll
new file mode 100644
index 00000000000..e4755085de7
--- /dev/null
+++ b/llvm/test/CodeGen/ARM/eh-resume-darwin.ll
@@ -0,0 +1,29 @@
+; RUN: llc < %s -march=arm | FileCheck %s
+target triple = "armv6-apple-macosx10.6"
+
+declare void @func()
+
+declare i8* @llvm.eh.exception() nounwind readonly
+
+declare i32 @llvm.eh.selector(i8*, i8*, ...) nounwind
+
+declare void @llvm.eh.resume(i8*, i32)
+
+declare i32 @__gxx_personality_sj0(...)
+
+define void @test0() {
+entry:
+ invoke void @func()
+ to label %cont unwind label %lpad
+
+cont:
+ ret void
+
+lpad:
+ %exn = call i8* @llvm.eh.exception()
+ %sel = call i32 (i8*, i8*, ...)* @llvm.eh.selector(i8* %exn, i8* bitcast (i32 (...)* @__gxx_personality_sj0 to i8*), i32 0)
+ call void @llvm.eh.resume(i8* %exn, i32 %sel) noreturn
+ unreachable
+}
+
+; CHECK: __Unwind_SjLj_Resume
OpenPOWER on IntegriCloud