diff options
| author | John McCall <rjmccall@apple.com> | 2010-11-07 02:35:25 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-11-07 02:35:25 +0000 |
| commit | 44680786286f4f651603c6811f8412a3ee7fe975 (patch) | |
| tree | 2541657d4b258fd0979fb9bde97802d2b119d31f | |
| parent | bdacf3c64867a132917386ac1c8df77e617d41fc (diff) | |
ARM EH uses a different personality function in C.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@118366 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGException.cpp | 3 | ||||
| -rw-r--r-- | lib/CodeGen/CGException.h | 1 | ||||
| -rw-r--r-- | test/CodeGen/exceptions.c | 19 |
3 files changed, 23 insertions, 0 deletions
diff --git a/lib/CodeGen/CGException.cpp b/lib/CodeGen/CGException.cpp index cb7bad2575..22ce184eb5 100644 --- a/lib/CodeGen/CGException.cpp +++ b/lib/CodeGen/CGException.cpp @@ -300,6 +300,7 @@ static llvm::Constant *getCatchallRethrowFn(CodeGenFunction &CGF, } const EHPersonality EHPersonality::GNU_C("__gcc_personality_v0"); +const EHPersonality EHPersonality::GNU_C_SJLJ("__gcc_personality_sj0"); const EHPersonality EHPersonality::NeXT_ObjC("__objc_personality_v0"); const EHPersonality EHPersonality::GNU_CPlusPlus("__gxx_personality_v0"); const EHPersonality EHPersonality::GNU_CPlusPlus_SJLJ("__gxx_personality_sj0"); @@ -307,6 +308,8 @@ const EHPersonality EHPersonality::GNU_ObjC("__gnu_objc_personality_v0", "objc_exception_throw"); static const EHPersonality &getCPersonality(const LangOptions &L) { + if (L.SjLjExceptions) + return EHPersonality::GNU_C_SJLJ; return EHPersonality::GNU_C; } diff --git a/lib/CodeGen/CGException.h b/lib/CodeGen/CGException.h index 9c81a4e7a8..5e6f1511ae 100644 --- a/lib/CodeGen/CGException.h +++ b/lib/CodeGen/CGException.h @@ -44,6 +44,7 @@ class EHPersonality { public: static const EHPersonality &get(const LangOptions &Lang); static const EHPersonality GNU_C; + static const EHPersonality GNU_C_SJLJ; static const EHPersonality GNU_ObjC; static const EHPersonality NeXT_ObjC; static const EHPersonality GNU_CPlusPlus; diff --git a/test/CodeGen/exceptions.c b/test/CodeGen/exceptions.c new file mode 100644 index 0000000000..018b975395 --- /dev/null +++ b/test/CodeGen/exceptions.c @@ -0,0 +1,19 @@ +// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -emit-llvm -o - %s -fexceptions -fblocks | FileCheck %s +// RUN: %clang_cc1 -triple armv7-apple-unknown -emit-llvm -o - %s -fexceptions -fsjlj-exceptions -fblocks | FileCheck %s -check-prefix=CHECK-ARM + +// rdar://problem/8621849 +void test1() { + extern void test1_helper(void (^)(int)); + + // CHECK: define void @test1() + // CHECK-ARM: define arm_aapcscc void @test1() + + __block int x = 10; + + // CHECK: invoke void @test1_helper( + // CHECK-ARM: invoke arm_aapcscc void @test1_helper( + test1_helper(^(int v) { x = v; }); + + // CHECK: call {{.*}} @llvm.eh.selector({{.*}}, i8* bitcast (i32 (...)* @__gcc_personality_v0 to i8*) + // CHECK-ARM: call {{.*}} @llvm.eh.selector({{.*}}, i8* bitcast (i32 (...)* @__gcc_personality_sj0 to i8*) +} |