forked from OSchip/llvm-project
[SEH] Use catchret in the new EH IR like we do for C++
Also add tests for SEH with the new IRGen. llvm-svn: 247318
This commit is contained in:
Reid Kleckner
parent
7cb25c9b69
commit
bb34b60359
|
|
@ -1807,7 +1807,7 @@ void CodeGenFunction::EnterSEHTryStmt(const SEHTryStmt &S) {
|
|||
HelperCGF.GenerateSEHFilterFunction(*this, *Except);
|
||||
llvm::Constant *OpaqueFunc =
|
||||
llvm::ConstantExpr::getBitCast(FilterFunc, Int8PtrTy);
|
||||
CatchScope->setHandler(0, OpaqueFunc, createBasicBlock("__except"));
|
||||
CatchScope->setHandler(0, OpaqueFunc, createBasicBlock("__except.ret"));
|
||||
}
|
||||
|
||||
void CodeGenFunction::ExitSEHTryStmt(const SEHTryStmt &S) {
|
||||
|
|
@ -1848,6 +1848,18 @@ void CodeGenFunction::ExitSEHTryStmt(const SEHTryStmt &S) {
|
|||
|
||||
EmitBlockAfterUses(ExceptBB);
|
||||
|
||||
if (CGM.getCodeGenOpts().NewMSEH) {
|
||||
// __except blocks don't get outlined into funclets, so immediately do a
|
||||
// catchret.
|
||||
llvm::BasicBlock *CatchPadBB = ExceptBB->getSinglePredecessor();
|
||||
assert(CatchPadBB && "only ExceptBB pred should be catchpad");
|
||||
llvm::CatchPadInst *CPI =
|
||||
cast<llvm::CatchPadInst>(CatchPadBB->getFirstNonPHI());
|
||||
ExceptBB = createBasicBlock("__except");
|
||||
Builder.CreateCatchRet(CPI, ExceptBB);
|
||||
EmitBlock(ExceptBB);
|
||||
}
|
||||
|
||||
// On Win64, the exception pointer is the exception code. Copy it to the slot.
|
||||
if (CGM.getTarget().getTriple().getArch() != llvm::Triple::x86) {
|
||||
llvm::Value *Code =
|
||||
|
|
|
|||
|
|
@ -0,0 +1,251 @@
|
|||
// RUN: %clang_cc1 %s -triple x86_64-pc-win32 -fms-extensions -fnew-ms-eh -emit-llvm -o - \
|
||||
// RUN: | FileCheck %s --check-prefix=CHECK --check-prefix=X64
|
||||
// RUN: %clang_cc1 %s -triple i686-pc-win32 -fms-extensions -fnew-ms-eh -emit-llvm -o - \
|
||||
// RUN: | FileCheck %s --check-prefix=CHECK --check-prefix=X86
|
||||
|
||||
void try_body(int numerator, int denominator, int *myres) {
|
||||
*myres = numerator / denominator;
|
||||
}
|
||||
// CHECK-LABEL: define void @try_body(i32 %numerator, i32 %denominator, i32* %myres)
|
||||
// CHECK: sdiv i32
|
||||
// CHECK: store i32 %{{.*}}, i32*
|
||||
// CHECK: ret void
|
||||
|
||||
int safe_div(int numerator, int denominator, int *res) {
|
||||
int myres = 0;
|
||||
int success = 1;
|
||||
__try {
|
||||
try_body(numerator, denominator, &myres);
|
||||
} __except (1) {
|
||||
success = -42;
|
||||
}
|
||||
*res = myres;
|
||||
return success;
|
||||
}
|
||||
|
||||
// CHECK-LABEL: define i32 @safe_div(i32 %numerator, i32 %denominator, i32* %res)
|
||||
// X64-SAME: personality i8* bitcast (i32 (...)* @__C_specific_handler to i8*)
|
||||
// X86-SAME: personality i8* bitcast (i32 (...)* @_except_handler3 to i8*)
|
||||
// CHECK: invoke void @try_body(i32 %{{.*}}, i32 %{{.*}}, i32* %{{.*}}) #[[NOINLINE:[0-9]+]]
|
||||
// CHECK: to label %{{.*}} unwind label %[[catchpad:[^ ]*]]
|
||||
//
|
||||
// CHECK: [[catchpad]]
|
||||
// X64: %[[padtoken:[^ ]*]] = catchpad [i8* null] to label %[[exceptret:[^ ]*]] unwind label
|
||||
// X86: %[[padtoken:[^ ]*]] = catchpad [i8* bitcast (i32 ()* @"\01?filt$0@0@safe_div@@" to i8*)] to label %[[exceptret:[^ ]*]] unwind label
|
||||
//
|
||||
// CHECK: [[exceptret]]
|
||||
// CHECK: catchret %[[padtoken]] to label %[[except:[^ ]*]]
|
||||
//
|
||||
// CHECK: [[except]]
|
||||
// CHECK: store i32 -42, i32* %[[success:[^ ]*]]
|
||||
//
|
||||
// CHECK: %[[res:[^ ]*]] = load i32, i32* %[[success]]
|
||||
// CHECK: ret i32 %[[res]]
|
||||
|
||||
// 32-bit SEH needs this filter to save the exception code.
|
||||
//
|
||||
// X86-LABEL: define internal i32 @"\01?filt$0@0@safe_div@@"()
|
||||
// X86: %[[ebp:[^ ]*]] = call i8* @llvm.frameaddress(i32 1)
|
||||
// X86: %[[fp:[^ ]*]] = call i8* @llvm.x86.seh.recoverfp(i8* bitcast (i32 (i32, i32, i32*)* @safe_div to i8*), i8* %[[ebp]])
|
||||
// X86: call i8* @llvm.localrecover(i8* bitcast (i32 (i32, i32, i32*)* @safe_div to i8*), i8* %[[fp]], i32 0)
|
||||
// X86: load i8*, i8**
|
||||
// X86: load i32*, i32**
|
||||
// X86: load i32, i32*
|
||||
// X86: store i32 %{{.*}}, i32*
|
||||
// X86: ret i32 1
|
||||
|
||||
void j(void);
|
||||
|
||||
int filter_expr_capture(void) {
|
||||
int r = 42;
|
||||
__try {
|
||||
j();
|
||||
} __except(r = -1) {
|
||||
r = 13;
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
// CHECK-LABEL: define i32 @filter_expr_capture()
|
||||
// X64-SAME: personality i8* bitcast (i32 (...)* @__C_specific_handler to i8*)
|
||||
// X86-SAME: personality i8* bitcast (i32 (...)* @_except_handler3 to i8*)
|
||||
// X64: call void (...) @llvm.localescape(i32* %[[r:[^ ,]*]])
|
||||
// X86: call void (...) @llvm.localescape(i32* %[[r:[^ ,]*]], i32* %[[code:[^ ,]*]])
|
||||
// CHECK: store i32 42, i32* %[[r]]
|
||||
// CHECK: invoke void @j() #[[NOINLINE]]
|
||||
//
|
||||
// CHECK: catchpad [i8* bitcast (i32 ({{.*}})* @"\01?filt$0@0@filter_expr_capture@@" to i8*)]
|
||||
// CHECK: store i32 13, i32* %[[r]]
|
||||
//
|
||||
// CHECK: %[[rv:[^ ]*]] = load i32, i32* %[[r]]
|
||||
// CHECK: ret i32 %[[rv]]
|
||||
|
||||
// X64-LABEL: define internal i32 @"\01?filt$0@0@filter_expr_capture@@"(i8* %exception_pointers, i8* %frame_pointer)
|
||||
// X64: call i8* @llvm.localrecover(i8* bitcast (i32 ()* @filter_expr_capture to i8*), i8* %frame_pointer, i32 0)
|
||||
//
|
||||
// X86-LABEL: define internal i32 @"\01?filt$0@0@filter_expr_capture@@"()
|
||||
// X86: %[[ebp:[^ ]*]] = call i8* @llvm.frameaddress(i32 1)
|
||||
// X86: %[[fp:[^ ]*]] = call i8* @llvm.x86.seh.recoverfp(i8* bitcast (i32 ()* @filter_expr_capture to i8*), i8* %[[ebp]])
|
||||
// X86: call i8* @llvm.localrecover(i8* bitcast (i32 ()* @filter_expr_capture to i8*), i8* %[[fp]], i32 0)
|
||||
//
|
||||
// CHECK: store i32 -1, i32* %{{.*}}
|
||||
// CHECK: ret i32 -1
|
||||
|
||||
int nested_try(void) {
|
||||
int r = 42;
|
||||
__try {
|
||||
__try {
|
||||
j();
|
||||
r = 0;
|
||||
} __except(_exception_code() == 123) {
|
||||
r = 123;
|
||||
}
|
||||
} __except(_exception_code() == 456) {
|
||||
r = 456;
|
||||
}
|
||||
return r;
|
||||
}
|
||||
// CHECK-LABEL: define i32 @nested_try()
|
||||
// X64-SAME: personality i8* bitcast (i32 (...)* @__C_specific_handler to i8*)
|
||||
// X86-SAME: personality i8* bitcast (i32 (...)* @_except_handler3 to i8*)
|
||||
// CHECK: store i32 42, i32* %[[r:[^ ,]*]]
|
||||
// CHECK: invoke void @j() #[[NOINLINE]]
|
||||
// CHECK: to label %[[cont:[^ ]*]] unwind label %[[cpad_inner:[^ ]*]]
|
||||
//
|
||||
// CHECK: [[cpad_inner]]
|
||||
// CHECK: catchpad [i8* bitcast (i32 ({{.*}})* @"\01?filt$1@0@nested_try@@" to i8*)] to label %[[exceptret_inner:[^ ]*]] unwind label %[[cpad_outer:[^ ]*]]
|
||||
//
|
||||
// CHECK: [[exceptret_inner]]
|
||||
// CHECK: catchret {{.*}} to label %[[except_inner:[^ ]*]]
|
||||
//
|
||||
// CHECK: [[except_inner]]
|
||||
// CHECK: store i32 123, i32* %[[r]]
|
||||
// CHECK: br label %[[inner_try_cont:[^ ]*]]
|
||||
//
|
||||
// CHECK: [[inner_try_cont]]
|
||||
// CHECK: br label %[[outer_try_cont:[^ ]*]]
|
||||
//
|
||||
// CHECK: [[cpad_outer]]
|
||||
// CHECK: catchpad [i8* bitcast (i32 ({{.*}})* @"\01?filt$0@0@nested_try@@" to i8*)] to label %[[exceptret_outer:[^ ]*]] unwind label
|
||||
//
|
||||
// CHECK: [[exceptret_outer]]
|
||||
// CHECK: catchret {{.*}} to label %[[except_outer:[^ ]*]]
|
||||
//
|
||||
// CHECK: [[except_outer]]
|
||||
// CHECK: store i32 456, i32* %[[r]]
|
||||
// CHECK: br label %[[outer_try_cont]]
|
||||
//
|
||||
// CHECK: [[outer_try_cont]]
|
||||
// CHECK: %[[r_load:[^ ]*]] = load i32, i32* %[[r]]
|
||||
// CHECK: ret i32 %[[r_load]]
|
||||
//
|
||||
// CHECK: [[cont]]
|
||||
// CHECK: store i32 0, i32* %[[r]]
|
||||
// CHECK: br label %[[inner_try_cont]]
|
||||
//
|
||||
// CHECK-LABEL: define internal i32 @"\01?filt$0@0@nested_try@@"({{.*}})
|
||||
// X86: call i8* @llvm.x86.seh.recoverfp({{.*}})
|
||||
// CHECK: load i32*, i32**
|
||||
// CHECK: load i32, i32*
|
||||
// CHECK: icmp eq i32 %{{.*}}, 456
|
||||
//
|
||||
// CHECK-LABEL: define internal i32 @"\01?filt$1@0@nested_try@@"({{.*}})
|
||||
// X86: call i8* @llvm.x86.seh.recoverfp({{.*}})
|
||||
// CHECK: load i32*, i32**
|
||||
// CHECK: load i32, i32*
|
||||
// CHECK: icmp eq i32 %{{.*}}, 123
|
||||
|
||||
int basic_finally(int g) {
|
||||
__try {
|
||||
j();
|
||||
} __finally {
|
||||
++g;
|
||||
}
|
||||
return g;
|
||||
}
|
||||
// CHECK-LABEL: define i32 @basic_finally(i32 %g)
|
||||
// X64-SAME: personality i8* bitcast (i32 (...)* @__C_specific_handler to i8*)
|
||||
// X86-SAME: personality i8* bitcast (i32 (...)* @_except_handler3 to i8*)
|
||||
// CHECK: %[[g_addr:[^ ]*]] = alloca i32, align 4
|
||||
// CHECK: call void (...) @llvm.localescape(i32* %[[g_addr]])
|
||||
// CHECK: store i32 %g, i32* %[[g_addr]]
|
||||
//
|
||||
// CHECK: invoke void @j()
|
||||
// CHECK: to label %[[cont:[^ ]*]] unwind label %[[cleanuppad:[^ ]*]]
|
||||
//
|
||||
// CHECK: [[cont]]
|
||||
// CHECK: %[[fp:[^ ]*]] = call i8* @llvm.localaddress()
|
||||
// CHECK: call void @"\01?fin$0@0@basic_finally@@"({{i8( zeroext)?}} 0, i8* %[[fp]])
|
||||
// CHECK: load i32, i32* %[[g_addr]], align 4
|
||||
// CHECK: ret i32
|
||||
//
|
||||
// CHECK: [[cleanuppad]]
|
||||
// CHECK: %[[padtoken:[^ ]*]] = cleanuppad []
|
||||
// CHECK: %[[fp:[^ ]*]] = call i8* @llvm.localaddress()
|
||||
// CHECK: call void @"\01?fin$0@0@basic_finally@@"({{i8( zeroext)?}} 1, i8* %[[fp]])
|
||||
// CHECK: cleanupret %[[padtoken]] unwind to caller
|
||||
|
||||
// CHECK: define internal void @"\01?fin$0@0@basic_finally@@"({{i8( zeroext)?}} %abnormal_termination, i8* %frame_pointer)
|
||||
// CHECK: call i8* @llvm.localrecover(i8* bitcast (i32 (i32)* @basic_finally to i8*), i8* %frame_pointer, i32 0)
|
||||
// CHECK: load i32, i32* %{{.*}}, align 4
|
||||
// CHECK: add nsw i32 %{{.*}}, 1
|
||||
// CHECK: store i32 %{{.*}}, i32* %{{.*}}, align 4
|
||||
// CHECK: ret void
|
||||
|
||||
int returns_int(void);
|
||||
int except_return(void) {
|
||||
__try {
|
||||
return returns_int();
|
||||
} __except(1) {
|
||||
return 42;
|
||||
}
|
||||
}
|
||||
// CHECK-LABEL: define i32 @except_return()
|
||||
// CHECK: %[[tmp:[^ ]*]] = invoke i32 @returns_int()
|
||||
// CHECK: to label %[[cont:[^ ]*]] unwind label %[[catchpad:[^ ]*]]
|
||||
//
|
||||
// CHECK: [[catchpad]]
|
||||
// CHECK: catchpad
|
||||
// CHECK: catchret
|
||||
// CHECK: store i32 42, i32* %[[rv:[^ ]*]]
|
||||
// CHECK: br label %[[retbb:[^ ]*]]
|
||||
//
|
||||
// CHECK: [[cont]]
|
||||
// CHECK: store i32 %[[tmp]], i32* %[[rv]]
|
||||
// CHECK: br label %[[retbb]]
|
||||
//
|
||||
// CHECK: [[retbb]]
|
||||
// CHECK: %[[r:[^ ]*]] = load i32, i32* %[[rv]]
|
||||
// CHECK: ret i32 %[[r]]
|
||||
|
||||
|
||||
// PR 24751: don't assert if a variable is used twice in a __finally block.
|
||||
// Also, make sure we don't do redundant work to capture/project it.
|
||||
void finally_capture_twice(int x) {
|
||||
__try {
|
||||
} __finally {
|
||||
int y = x;
|
||||
int z = x;
|
||||
}
|
||||
}
|
||||
//
|
||||
// CHECK-LABEL: define void @finally_capture_twice(
|
||||
// CHECK: [[X:%.*]] = alloca i32, align 4
|
||||
// CHECK: call void (...) @llvm.localescape(i32* [[X]])
|
||||
// CHECK-NEXT: store i32 {{.*}}, i32* [[X]], align 4
|
||||
// CHECK-NEXT: [[LOCAL:%.*]] = call i8* @llvm.localaddress()
|
||||
// CHECK-NEXT: call void [[FINALLY:@.*]](i8{{ zeroext | }}0, i8* [[LOCAL]])
|
||||
// CHECK: define internal void [[FINALLY]](
|
||||
// CHECK: [[LOCAL:%.*]] = call i8* @llvm.localrecover(
|
||||
// CHECK: [[X:%.*]] = bitcast i8* [[LOCAL]] to i32*
|
||||
// CHECK-NEXT: [[Y:%.*]] = alloca i32, align 4
|
||||
// CHECK-NEXT: [[Z:%.*]] = alloca i32, align 4
|
||||
// CHECK-NEXT: store i8*
|
||||
// CHECK-NEXT: store i8
|
||||
// CHECK-NEXT: [[T0:%.*]] = load i32, i32* [[X]], align 4
|
||||
// CHECK-NEXT: store i32 [[T0]], i32* [[Y]], align 4
|
||||
// CHECK-NEXT: [[T0:%.*]] = load i32, i32* [[X]], align 4
|
||||
// CHECK-NEXT: store i32 [[T0]], i32* [[Z]], align 4
|
||||
// CHECK-NEXT: ret void
|
||||
|
||||
// CHECK: attributes #[[NOINLINE]] = { {{.*noinline.*}} }
|
||||
|
|
@ -240,7 +240,7 @@ void finally_capture_twice(int x) {
|
|||
int z = x;
|
||||
}
|
||||
}
|
||||
//
|
||||
//
|
||||
// CHECK-LABEL: define void @finally_capture_twice(
|
||||
// CHECK: [[X:%.*]] = alloca i32, align 4
|
||||
// CHECK: call void (...) @llvm.localescape(i32* [[X]])
|
||||
|
|
|
|||
Loading…
Reference in New Issue