This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGabe8b354e37d: Fix vtbl field addr space (authored by yaxunl).
Herald added a project: clang.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D109841/new/
https://reviews.llvm.org/D109841
Files:
clang/lib/CodeGen/CGClass.cpp
Index: clang/lib/CodeGen/CGClass.cpp
===================================================================
--- clang/lib/CodeGen/CGClass.cpp
+++ clang/lib/CodeGen/CGClass.cpp
@@ -2502,6 +2502,8 @@
// Apply the offsets.
Address VTableField = LoadCXXThisAddress();
+ unsigned ThisAddrSpace =
+ VTableField.getPointer()->getType()->getPointerAddressSpace();
if (!NonVirtualOffset.isZero() || VirtualOffset)
VTableField = ApplyNonVirtualAndVirtualOffset(
@@ -2516,12 +2518,11 @@
llvm::FunctionType::get(CGM.Int32Ty, /*isVarArg=*/true)
->getPointerTo(ProgAS)
->getPointerTo(GlobalsAS);
- // vtable field is is derived from `this` pointer, therefore it should be in
- // default address space.
- VTableField = Builder.CreatePointerBitCastOrAddrSpaceCast(
- VTableField, VTablePtrTy->getPointerTo());
- VTableAddressPoint = Builder.CreatePointerBitCastOrAddrSpaceCast(
- VTableAddressPoint, VTablePtrTy);
+ // vtable field is is derived from `this` pointer, therefore they should be
in
+ // the same addr space. Note that this might not be LLVM address space 0.
+ VTableField = Builder.CreateBitCast(VTableField,
+
VTablePtrTy->getPointerTo(ThisAddrSpace));
+ VTableAddressPoint = Builder.CreateBitCast(VTableAddressPoint, VTablePtrTy);
llvm::StoreInst *Store = Builder.CreateStore(VTableAddressPoint,
VTableField);
TBAAAccessInfo TBAAInfo = CGM.getTBAAVTablePtrAccessInfo(VTablePtrTy);
Index: clang/lib/CodeGen/CGClass.cpp
===================================================================
--- clang/lib/CodeGen/CGClass.cpp
+++ clang/lib/CodeGen/CGClass.cpp
@@ -2502,6 +2502,8 @@
// Apply the offsets.
Address VTableField = LoadCXXThisAddress();
+ unsigned ThisAddrSpace =
+ VTableField.getPointer()->getType()->getPointerAddressSpace();
if (!NonVirtualOffset.isZero() || VirtualOffset)
VTableField = ApplyNonVirtualAndVirtualOffset(
@@ -2516,12 +2518,11 @@
llvm::FunctionType::get(CGM.Int32Ty, /*isVarArg=*/true)
->getPointerTo(ProgAS)
->getPointerTo(GlobalsAS);
- // vtable field is is derived from `this` pointer, therefore it should be in
- // default address space.
- VTableField = Builder.CreatePointerBitCastOrAddrSpaceCast(
- VTableField, VTablePtrTy->getPointerTo());
- VTableAddressPoint = Builder.CreatePointerBitCastOrAddrSpaceCast(
- VTableAddressPoint, VTablePtrTy);
+ // vtable field is is derived from `this` pointer, therefore they should be in
+ // the same addr space. Note that this might not be LLVM address space 0.
+ VTableField = Builder.CreateBitCast(VTableField,
+ VTablePtrTy->getPointerTo(ThisAddrSpace));
+ VTableAddressPoint = Builder.CreateBitCast(VTableAddressPoint, VTablePtrTy);
llvm::StoreInst *Store = Builder.CreateStore(VTableAddressPoint, VTableField);
TBAAAccessInfo TBAAInfo = CGM.getTBAAVTablePtrAccessInfo(VTablePtrTy);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
