diff options
| -rw-r--r-- | clang/include/clang/Basic/Builtins.def | 4 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGBuiltin.cpp | 13 | ||||
| -rw-r--r-- | clang/lib/CodeGen/TargetInfo.h | 5 | ||||
| -rw-r--r-- | clang/test/CodeGen/builtin-longjmp.c | 31 |
4 files changed, 27 insertions, 26 deletions
diff --git a/clang/include/clang/Basic/Builtins.def b/clang/include/clang/Basic/Builtins.def index 632509bf896..29fd7b49cb2 100644 --- a/clang/include/clang/Basic/Builtins.def +++ b/clang/include/clang/Basic/Builtins.def @@ -448,8 +448,8 @@ BUILTIN(__builtin_extract_return_addr, "v*v*", "n") BUILTIN(__builtin_frame_address, "v*IUi", "n") BUILTIN(__builtin___clear_cache, "vc*c*", "n") BUILTIN(__builtin_flt_rounds, "i", "nc") -BUILTIN(__builtin_setjmp, "iv**", "Fj") -BUILTIN(__builtin_longjmp, "vv**i", "Fr") +BUILTIN(__builtin_setjmp, "iv**", "j") +BUILTIN(__builtin_longjmp, "vv**i", "r") BUILTIN(__builtin_unwind_init, "v", "") BUILTIN(__builtin_eh_return_data_regno, "iIi", "nc") BUILTIN(__builtin_snprintf, "ic*zcC*.", "nFp:2:") diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index d3d1e22b4bb..014ea9d9392 100644 --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp @@ -859,8 +859,11 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, return RValue::get(Builder.CreateZExt(Result, Int64Ty, "extend.zext")); } case Builtin::BI__builtin_setjmp: { - if (!getTargetHooks().hasSjLjLowering(*this)) - break; + if (!getTargetHooks().hasSjLjLowering(*this)) { + CGM.ErrorUnsupported(E, "__builtin_setjmp"); + return RValue::get(nullptr); + } + // Buffer is a void**. Value *Buf = EmitScalarExpr(E->getArg(0)); @@ -883,8 +886,10 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, return RValue::get(Builder.CreateCall(F, Buf)); } case Builtin::BI__builtin_longjmp: { - if (!getTargetHooks().hasSjLjLowering(*this)) - break; + if (!getTargetHooks().hasSjLjLowering(*this)) { + CGM.ErrorUnsupported(E, "__builtin_longjmp"); + return RValue::get(nullptr); + } Value *Buf = EmitScalarExpr(E->getArg(0)); Buf = Builder.CreateBitCast(Buf, Int8PtrTy); diff --git a/clang/lib/CodeGen/TargetInfo.h b/clang/lib/CodeGen/TargetInfo.h index 87f13760e8e..0c3fdc3c8ac 100644 --- a/clang/lib/CodeGen/TargetInfo.h +++ b/clang/lib/CodeGen/TargetInfo.h @@ -226,9 +226,8 @@ public: return 0; } - /// Control whether __builtin_longjmp / __builtin_setjmp are lowered to - /// llvm.eh.sjlj.longjmp / llvm.eh.sjlj.setjmp or the normal library - /// function. + /// Control if __builtin_longjmp / __builtin_setjmp can be lowered to + /// llvm.eh.sjlj.longjmp / llvm.eh.sjlj.setjmp. virtual bool hasSjLjLowering(CodeGen::CodeGenFunction &CGF) const { return false; } diff --git a/clang/test/CodeGen/builtin-longjmp.c b/clang/test/CodeGen/builtin-longjmp.c index 75c91b8374f..7f0fcfd951e 100644 --- a/clang/test/CodeGen/builtin-longjmp.c +++ b/clang/test/CodeGen/builtin-longjmp.c @@ -1,11 +1,12 @@ -// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm < %s| FileCheck %s -check-prefix=SUPPORTED -// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm < %s| FileCheck %s -check-prefix=SUPPORTED -// RUN: %clang_cc1 -triple powerpc-unknown-unknown -emit-llvm < %s| FileCheck %s -check-prefix=SUPPORTED -// RUN: %clang_cc1 -triple powerpc64-unknown-unknown -emit-llvm < %s| FileCheck %s -check-prefix=SUPPORTED -// RUN: %clang_cc1 -triple arm-unknown-unknown -emit-llvm < %s| FileCheck %s -check-prefix=UNSUPPORTED -// RUN: %clang_cc1 -triple aarch64-unknown-unknown -emit-llvm < %s| FileCheck %s -check-prefix=UNSUPPORTED -// RUN: %clang_cc1 -triple mips-unknown-unknown -emit-llvm < %s| FileCheck %s -check-prefix=UNSUPPORTED -// RUN: %clang_cc1 -triple mips64-unknown-unknown -emit-llvm < %s| FileCheck %s -check-prefix=UNSUPPORTED +// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm < %s| FileCheck %s +// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm < %s| FileCheck %s +// RUN: %clang_cc1 -triple powerpc-unknown-unknown -emit-llvm < %s| FileCheck %s +// RUN: %clang_cc1 -triple powerpc64-unknown-unknown -emit-llvm < %s| FileCheck %s + +// RUN: %clang_cc1 -triple arm-unknown-unknown -emit-llvm -verify %s +// RUN: %clang_cc1 -triple aarch64-unknown-unknown -emit-llvm -verify %s +// RUN: %clang_cc1 -triple mips-unknown-unknown -emit-llvm -verify %s +// RUN: %clang_cc1 -triple mips64-unknown-unknown -emit-llvm -verify %s // Check that __builtin_longjmp and __builtin_setjmp are lowerd into // IR intrinsics on those architectures that can handle them. @@ -14,18 +15,14 @@ typedef void *jmp_buf; jmp_buf buf; -// SUPPORTED: define{{.*}} void @do_jump() -// SUPPORTED: call{{.*}} void @llvm.eh.sjlj.longjmp -// UNSUPPORTED: define{{.*}} void @do_jump() -// UNSUPPORTED: call{{.*}} void @longjmp +// CHECK: define{{.*}} void @do_jump() +// CHECK: call{{.*}} void @llvm.eh.sjlj.longjmp -// SUPPORTED: define{{.*}} void @do_setjmp() -// SUPPORTED: call{{.*}} i32 @llvm.eh.sjlj.setjmp -// UNSUPPORTED: define{{.*}} void @do_setjmp() -// UNSUPPORTED: call{{.*}} i32 @setjmp +// CHECK: define{{.*}} void @do_setjmp() +// CHECK: call{{.*}} i32 @llvm.eh.sjlj.setjmp void do_jump(void) { - __builtin_longjmp(buf, 1); + __builtin_longjmp(buf, 1); // expected-error {{cannot compile this __builtin_longjmp yet}} } void f(void); |
