Skip to content

[clang][CodeGen] The eh_typeid_for intrinsic needs special care too #65699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 20, 2023
Merged

[clang][CodeGen] The eh_typeid_for intrinsic needs special care too #65699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f4271e0
AS_cast the argument to `eh_typeid_for` iff typeinfo is not in the de…
AlexVlx Sep 7, 2023
d3860ac
Merge branch 'main' of https://github.com/llvm/llvm-project into type…
AlexVlx Sep 10, 2023
938c798
Switch to using the target hook for the as-cast.
AlexVlx Sep 10, 2023
539b4d0
Merge branch 'main' of https://github.com/llvm/llvm-project into type…
AlexVlx Sep 19, 2023
cc1b96c
Merge branch 'main' of https://github.com/llvm/llvm-project into type…
AlexVlx Sep 20, 2023
ff5d537
Merge branch 'main' of https://github.com/llvm/llvm-project into type…
AlexVlx Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion clang/lib/CodeGen/CGException.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,6 +1136,8 @@ static void emitCatchDispatchBlock(CodeGenFunction &CGF,
// Select the right handler.
llvm::Function *llvm_eh_typeid_for =
CGF.CGM.getIntrinsic(llvm::Intrinsic::eh_typeid_for);
llvm::Type *argTy = llvm_eh_typeid_for->getArg(0)->getType();
LangAS globAS = CGF.CGM.GetGlobalVarAddressSpace(nullptr);

// Load the selector value.
llvm::Value *selector = CGF.getSelectorFromSlot();
Expand All @@ -1149,7 +1151,11 @@ static void emitCatchDispatchBlock(CodeGenFunction &CGF,
assert(handler.Type.Flags == 0 &&
"landingpads do not support catch handler flags");
assert(typeValue && "fell into catch-all case!");
typeValue = CGF.Builder.CreateBitCast(typeValue, CGF.Int8PtrTy);
// With opaque ptrs, only the address space can be a mismatch.
if (typeValue->getType() != argTy)
typeValue =
CGF.getTargetHooks().performAddrSpaceCast(CGF, typeValue, globAS,
LangAS::Default, argTy);

// Figure out the next block.
bool nextIsEnd;
Expand Down
25 changes: 25 additions & 0 deletions clang/test/CodeGenCXX/try-catch-with-address-space.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// RUN: %clang_cc1 %s -triple=amdgcn-amd-amdhsa -emit-llvm -o - -fcxx-exceptions -fexceptions | FileCheck %s

struct X { };

const X g();

void f() {
try {
throw g();
// CHECK: ptr addrspace(1) @_ZTI1X
} catch (const X x) {
// CHECK: catch ptr addrspace(1) @_ZTI1X
// CHECK: call i32 @llvm.eh.typeid.for(ptr addrspacecast (ptr addrspace(1) @_ZTI1X to ptr))
}
}

void h() {
try {
throw "ABC";
// CHECK: ptr addrspace(1) @_ZTIPKc
} catch (char const(&)[4]) {
// CHECK: catch ptr addrspace(1) @_ZTIA4_c
// CHECK: call i32 @llvm.eh.typeid.for(ptr addrspacecast (ptr addrspace(1) @_ZTIA4_c to ptr))
}
}