From 8fcec56c0b9b4e3e6e65772d66cf82a319aa35f1 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 7 Oct 2015 01:07:13 +0000 Subject: [PATCH] [SEH] Fix x64 __exception_code in __except blocks Use llvm.eh.exceptioncode to get the code out of EAX for x64. For 32-bit, the filter is responsible for storing it to memory for us. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@249497 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGException.cpp | 23 +++++++++++++++-------- test/CodeGen/exceptions-seh-new.c | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/lib/CodeGen/CGException.cpp b/lib/CodeGen/CGException.cpp index ebeb727085..2490098d67 100644 --- a/lib/CodeGen/CGException.cpp +++ b/lib/CodeGen/CGException.cpp @@ -1898,14 +1898,21 @@ void CodeGenFunction::ExitSEHTryStmt(const SEHTryStmt &S) { 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 = - Builder.CreatePtrToInt(getExceptionFromSlot(), IntPtrTy); - Code = Builder.CreateTrunc(Code, Int32Ty); - Builder.CreateStore(Code, SEHCodeSlotStack.back()); + // On Win64, the exception code is returned in EAX. Copy it into the slot. + if (CGM.getTarget().getTriple().getArch() != llvm::Triple::x86) { + llvm::Function *SEHCodeIntrin = + CGM.getIntrinsic(llvm::Intrinsic::eh_exceptioncode); + llvm::Value *Code = Builder.CreateCall(SEHCodeIntrin, {CPI}); + Builder.CreateStore(Code, SEHCodeSlotStack.back()); + } + } else { + // 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 = + Builder.CreatePtrToInt(getExceptionFromSlot(), IntPtrTy); + Code = Builder.CreateTrunc(Code, Int32Ty); + Builder.CreateStore(Code, SEHCodeSlotStack.back()); + } } // Emit the __except body. diff --git a/test/CodeGen/exceptions-seh-new.c b/test/CodeGen/exceptions-seh-new.c index 795277bd9b..1a50ed0dea 100644 --- a/test/CodeGen/exceptions-seh-new.c +++ b/test/CodeGen/exceptions-seh-new.c @@ -265,4 +265,25 @@ void finally_capture_twice(int x) { // CHECK-NEXT: store i32 [[T0]], i32* [[Z]], align 4 // CHECK-NEXT: ret void +int exception_code_in_except(void) { + __try { + try_body(0, 0, 0); + } __except(1) { + return _exception_code(); + } +} + +// CHECK-LABEL: define i32 @exception_code_in_except() +// CHECK: %[[ret_slot:[^ ]*]] = alloca i32 +// CHECK: %[[code_slot:[^ ]*]] = alloca i32 +// CHECK: invoke void @try_body(i32 0, i32 0, i32* null) +// CHECK: %[[pad:[^ ]*]] = catchpad +// CHECK: catchret %[[pad]] +// X64: %[[code:[^ ]*]] = call i32 @llvm.eh.exceptioncode(token %[[pad]]) +// X64: store i32 %[[code]], i32* %[[code_slot]] +// CHECK: %[[ret1:[^ ]*]] = load i32, i32* %[[code_slot]] +// CHECK: store i32 %[[ret1]], i32* %[[ret_slot]] +// CHECK: %[[ret2:[^ ]*]] = load i32, i32* %[[ret_slot]] +// CHECK: ret i32 %[[ret2]] + // CHECK: attributes #[[NOINLINE]] = { {{.*noinline.*}} } -- 2.40.0