diff options
| -rw-r--r-- | clang/lib/CodeGen/CGException.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CodeGen/windows-seh-EHa-CppCatchDotDotDot.cpp | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp index 3707c8792491..8b0776b9a52b 100644 --- a/clang/lib/CodeGen/CGException.cpp +++ b/clang/lib/CodeGen/CGException.cpp @@ -646,7 +646,7 @@ void CodeGenFunction::EnterCXXTryStmt(const CXXTryStmt &S, bool IsFnTryBlock) { // Under async exceptions, catch(...) need to catch HW exception too // Mark scope with SehTryBegin as a SEH __try scope if (getLangOpts().EHAsynch) - EmitRuntimeCallOrInvoke(getSehTryBeginFn(CGM)); + EmitSehTryScopeBegin(); } } } diff --git a/clang/test/CodeGen/windows-seh-EHa-CppCatchDotDotDot.cpp b/clang/test/CodeGen/windows-seh-EHa-CppCatchDotDotDot.cpp index 047894c395bb..c9e6c9925edd 100644 --- a/clang/test/CodeGen/windows-seh-EHa-CppCatchDotDotDot.cpp +++ b/clang/test/CodeGen/windows-seh-EHa-CppCatchDotDotDot.cpp @@ -9,11 +9,21 @@ // CHECK: %[[dst1:[0-9-]+]] = catchpad within %[[dst]] [ptr null, i32 0, ptr null] // CHECK: "funclet"(token %[[dst1]]) +// CHECK: define dso_local void @"?bar@@YAXXZ +// CHECK: invoke void @llvm.seh.try.begin() +// CHECK: invoke void @_CxxThrowException +// CHECK: %[[dst:[0-9-]+]] = catchpad within %0 [ptr null, i32 0, ptr null] +// CHECK: invoke void @llvm.seh.try.begin() [ "funclet"(token %[[dst]]) ] + // CHECK: invoke void @llvm.seh.try.begin() // CHECK: %[[src:[0-9-]+]] = load volatile i32, ptr %i // CHECK-NEXT: invoke void @"?crash@@YAXH@Z"(i32 noundef %[[src]]) // CHECK: invoke void @llvm.seh.try.end() +// CHECK: invoke void @llvm.seh.try.begin() +// CHECK: invoke void @"?bar@@YAXXZ"() +// CHECK: invoke void @llvm.seh.try.end() + // ***************************************************************************** // Abstract: Test CPP catch(...) under SEH -EHa option @@ -46,6 +56,18 @@ void crash(int i) { } } +void bar() { + try { + throw 1; + } catch(...) { + try { + *NullPtr = 0; + } catch (...) { + throw 1; + } + } +} + int main() { for (int i = 0; i < 2; i++) { __try { @@ -54,5 +76,10 @@ int main() { printf(" Test CPP unwind: in except handler i = %d \n", i); } } + __try { + bar(); + } __except (1) { + printf("Test CPP unwind: in except handler \n"); + } return 0; } |