[clang] [clang][CodeGen] Use globals address space for vptr record members (PR #235794)

via cfe-commits cfe-commits at lists.llvm.org
Mon Oct 26 08:00:40 PDT 2026


llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang

Author: Arseniy Obolenskiy (aobolensk)

<details>
<summary>Changes</summary>

Match the vptr loads and stores

On spirv64-amd, an address space 0 vptr becomes a 32-bit pointer, so the device layout no longer matches the host

---
Full diff: https://github.com/llvm/llvm-project/pull/235794.diff


5 Files Affected:

- (modified) clang/lib/CodeGen/CGRecordLayoutBuilder.cpp (+3-5) 
- (modified) clang/test/CodeGenCUDA/record-layout.cu (+2-1) 
- (modified) clang/test/CodeGenCXX/bitfield-access-tail.cpp (+10-2) 
- (modified) clang/test/CodeGenCXX/vtable-consteval-address-space.cpp (+4-4) 
- (modified) clang/test/CodeGenCXX/vtable-pointer-initialization-address-space.cpp (+17) 


``````````diff
diff --git a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
index 0a5fd222b7d80b..bef456d85ba4ad 100644
--- a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
+++ b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
@@ -839,14 +839,12 @@ void CGRecordLowering::computeVolatileBitfields() {
 }
 
 void CGRecordLowering::accumulateVPtrs() {
+  llvm::Type *VPtrTy = Types.getCGM().GlobalsInt8PtrTy;
   if (Layout.hasOwnVFPtr())
-    Members.push_back(
-        MemberInfo(CharUnits::Zero(), MemberInfo::VFPtr,
-                   llvm::PointerType::getUnqual(Types.getLLVMContext())));
+    Members.push_back(MemberInfo(CharUnits::Zero(), MemberInfo::VFPtr, VPtrTy));
   if (Layout.hasOwnVBPtr())
     Members.push_back(
-        MemberInfo(Layout.getVBPtrOffset(), MemberInfo::VBPtr,
-                   llvm::PointerType::getUnqual(Types.getLLVMContext())));
+        MemberInfo(Layout.getVBPtrOffset(), MemberInfo::VBPtr, VPtrTy));
 }
 
 CharUnits
diff --git a/clang/test/CodeGenCUDA/record-layout.cu b/clang/test/CodeGenCUDA/record-layout.cu
index 74dab168efa800..fc1280481714dc 100644
--- a/clang/test/CodeGenCUDA/record-layout.cu
+++ b/clang/test/CodeGenCUDA/record-layout.cu
@@ -40,7 +40,8 @@ struct C : A, B {
 // AST-NEXT:             | [sizeof=24, align=8,
 // AST-NEXT:             |  nvsize=24, nvalign=8]
 
-// CHECK: %struct.I = type { ptr, i32 }
+// HOST: %struct.I = type { ptr, i32 }
+// DEV: %struct.I = type { ptr addrspace(1), i32 }
 // CHECK: %struct.J = type { %struct.I, i32 }
 
 // HOST: @0 = private constant { [4 x ptr] } { [4 x ptr] [ptr @"??_R4J@@6B@", ptr @"?f at J@@UEAAXXZ", ptr null, ptr @"?h at J@@UEAAXXZ"] }, comdat($"??_7J@@6B@")
diff --git a/clang/test/CodeGenCXX/bitfield-access-tail.cpp b/clang/test/CodeGenCXX/bitfield-access-tail.cpp
index c4f87f4a99748d..b6b788895b91a0 100644
--- a/clang/test/CodeGenCXX/bitfield-access-tail.cpp
+++ b/clang/test/CodeGenCXX/bitfield-access-tail.cpp
@@ -21,7 +21,7 @@
 
 // Configs that have expensive unaligned access
 // Little Endian
-// RUN: %clang_cc1 -triple=amdgpu-elf %s -emit-llvm -o /dev/null -fdump-record-layouts-simple | FileCheck --check-prefixes CHECK,LAYOUT,LAYOUT64 %s
+// RUN: %clang_cc1 -triple=amdgpu-elf %s -emit-llvm -o /dev/null -fdump-record-layouts-simple | FileCheck --check-prefixes CHECK,LAYOUT,LAYOUT64-AS1 %s
 // RUN: %clang_cc1 -triple=arc-elf %s -emit-llvm -o /dev/null -fdump-record-layouts-simple | FileCheck --check-prefixes CHECK,LAYOUT,LAYOUT32 %s
 // RUN: %clang_cc1 -triple=bpf %s -emit-llvm -o /dev/null -fdump-record-layouts-simple | FileCheck --check-prefixes CHECK,LAYOUT,LAYOUT64 %s
 // RUN: %clang_cc1 -triple=csky %s -emit-llvm -o /dev/null -fdump-record-layouts-simple | FileCheck --check-prefixes CHECK,LAYOUT,LAYOUT32 %s
@@ -30,7 +30,7 @@
 // RUN: %clang_cc1 -triple=nvptx-elf %s -emit-llvm -o /dev/null -fdump-record-layouts-simple | FileCheck --check-prefixes CHECK,LAYOUT,LAYOUT32 %s
 // RUN: %clang_cc1 -triple=riscv32 %s -emit-llvm -o /dev/null -fdump-record-layouts-simple | FileCheck --check-prefixes CHECK,LAYOUT,LAYOUT32 %s
 // RUN: %clang_cc1 -triple=riscv64 %s -emit-llvm -o /dev/null -fdump-record-layouts-simple | FileCheck --check-prefixes CHECK,LAYOUT,LAYOUT64 %s
-// RUN: %clang_cc1 -triple=spir-elf %s -emit-llvm -o /dev/null -fdump-record-layouts-simple | FileCheck --check-prefixes CHECK,LAYOUT,LAYOUT32 %s
+// RUN: %clang_cc1 -triple=spir-elf %s -emit-llvm -o /dev/null -fdump-record-layouts-simple | FileCheck --check-prefixes CHECK,LAYOUT,LAYOUT32-AS1 %s
 // RUN: %clang_cc1 -triple=xcore-none-elf %s -emit-llvm -o /dev/null -fdump-record-layouts-simple | FileCheck --check-prefixes CHECK,LAYOUT,LAYOUT32 %s
 
 // Big endian
@@ -123,11 +123,15 @@ struct D : virtual Char {
 } d;
 // CHECK-LABEL: LLVMType:%struct.D =
 // LAYOUT64-SAME: type <{ ptr, [3 x i8], %struct.Char, [4 x i8] }>
+// LAYOUT64-AS1-SAME: type <{ ptr addrspace(1), [3 x i8], %struct.Char, [4 x i8] }>
 // LAYOUT32-SAME: type { ptr, [3 x i8], %struct.Char }
+// LAYOUT32-AS1-SAME: type { ptr addrspace(1), [3 x i8], %struct.Char }
 // LAYOUT-DWN32-SAME: type { ptr, [3 x i8], %struct.Char }
 // CHECK-NEXT: NonVirtualBaseLLVMType:
 // LAYOUT64-SAME: %struct.D.base = type <{ ptr, i32 }>
+// LAYOUT64-AS1-SAME: %struct.D.base = type <{ ptr addrspace(1), i32 }>
 // LAYOUT32-SAME: %struct.D = type { ptr, [3 x i8], %struct.Char }
+// LAYOUT32-AS1-SAME: %struct.D = type { ptr addrspace(1), [3 x i8], %struct.Char }
 // LAYOUT-DWN32-SAME: %struct.D = type { ptr, [3 x i8], %struct.Char }
 // CHECK: BitFields:[
 // LAYOUT-NEXT: <CGBitFieldInfo Offset:{{[0-9]+}} Size:24 IsSigned:0 StorageSize:24 StorageOffset:{{(4|8)}}
@@ -143,11 +147,15 @@ struct E : virtual Int {
 } e;
 // CHECK-LABEL: LLVMType:%struct.E =
 // LAYOUT64-SAME: type <{ ptr, i32, %struct.Int }>
+// LAYOUT64-AS1-SAME: type <{ ptr addrspace(1), i32, %struct.Int }>
 // LAYOUT32-SAME: type { ptr, i32, %struct.Int }
+// LAYOUT32-AS1-SAME: type { ptr addrspace(1), i32, %struct.Int }
 // LAYOUT-DWN32-SAME: type { ptr, i32, %struct.Int }
 // CHECK-NEXT: NonVirtualBaseLLVMType:%struct.E.base =
 // LAYOUT64-SAME: type <{ ptr, i32 }>
+// LAYOUT64-AS1-SAME: type <{ ptr addrspace(1), i32 }>
 // LAYOUT32-SAME: type { ptr, i32 }
+// LAYOUT32-AS1-SAME: type { ptr addrspace(1), i32 }
 // LAYOUT-DWN32-SAME: type { ptr, i32 }
 // CHECK: BitFields:[
 // LAYOUT-NEXT: <CGBitFieldInfo Offset:{{[0-9]+}} Size:24 IsSigned:0 StorageSize:32 StorageOffset:{{(4|8)}}
diff --git a/clang/test/CodeGenCXX/vtable-consteval-address-space.cpp b/clang/test/CodeGenCXX/vtable-consteval-address-space.cpp
index 498bc92153a7c7..24dcc638e442b6 100644
--- a/clang/test/CodeGenCXX/vtable-consteval-address-space.cpp
+++ b/clang/test/CodeGenCXX/vtable-consteval-address-space.cpp
@@ -8,7 +8,7 @@
 struct A {
   virtual consteval void DoNotEmit_f() {}
 };
-// ITANIUM-DAG: @a = addrspace(1) global { {{.*}} ptr addrspace(1) @_ZTV1A,
+// ITANIUM-DAG: @a = addrspace(1) global %struct.A { {{.*}} ptr addrspace(1) @_ZTV1A,
 A a;
 
 // ITANIUM-DAG: @_ZTV1B = {{.*}} addrspace(1) constant { [4 x ptr addrspace(1)] } {{.*}} addrspace(1) null, ptr addrspace(1) @_ZTI1B, ptr addrspace(1) addrspacecast (ptr @_ZN1B1fEv to ptr addrspace(1)), ptr addrspace(1) addrspacecast (ptr @_ZN1B1hEv to ptr addrspace(1))
@@ -17,7 +17,7 @@ struct B {
   virtual consteval void DoNotEmit_g() {}
   virtual void h() {}
 };
-// ITANIUM-DAG: @b = addrspace(1) global { {{.*}} @_ZTV1B,
+// ITANIUM-DAG: @b = addrspace(1) global %struct.B { {{.*}} @_ZTV1B,
 B b;
 
 // ITANIUM-DAG: @_ZTV1C = {{.*}} addrspace(1) constant { [4 x ptr addrspace(1)] } {{.*}} addrspace(1) null, ptr addrspace(1) @_ZTI1C, ptr addrspace(1) addrspacecast (ptr @_ZN1CD1Ev to ptr addrspace(1)), ptr addrspace(1) addrspacecast (ptr @_ZN1CD0Ev to ptr addrspace(1))
@@ -25,7 +25,7 @@ struct C {
   virtual ~C() = default;
   virtual consteval C &operator=(const C&) = default;
 };
-// ITANIUM-DAG: @c = addrspace(1) global { {{.*}} @_ZTV1C,
+// ITANIUM-DAG: @c = addrspace(1) global %struct.C { {{.*}} @_ZTV1C,
 C c;
 
 // ITANIUM-DAG: @_ZTV1D = {{.*}} addrspace(1) constant { [4 x ptr addrspace(1)] } {{.*}} addrspace(1) null, ptr addrspace(1) @_ZTI1D, ptr addrspace(1) addrspacecast (ptr @_ZN1DD1Ev to ptr addrspace(1)), ptr addrspace(1) addrspacecast (ptr @_ZN1DD0Ev to ptr addrspace(1))
@@ -35,7 +35,7 @@ D d;
 
 // ITANIUM-DAG: @_ZTV1E = {{.*}} addrspace(1) constant { [3 x ptr addrspace(1)] } {{.*}} addrspace(1) null, ptr addrspace(1) @_ZTI1E, ptr addrspace(1) addrspacecast (ptr @_ZN1E1fEv to ptr addrspace(1))
 struct E { virtual void f() {} };
-// ITANIUM-DAG: @e = addrspace(1) global { {{.*}} @_ZTV1E,
+// ITANIUM-DAG: @e = addrspace(1) global %struct.E { {{.*}} @_ZTV1E,
 E e;
 
 // ITANIUM-DAG: @_ZTV1F = {{.*}} addrspace(1) constant { [3 x ptr addrspace(1)] } {{.*}} addrspace(1) null, ptr addrspace(1) @_ZTI1F, ptr addrspace(1) addrspacecast (ptr @_ZN1E1fEv to ptr addrspace(1))
diff --git a/clang/test/CodeGenCXX/vtable-pointer-initialization-address-space.cpp b/clang/test/CodeGenCXX/vtable-pointer-initialization-address-space.cpp
index eaf6887bc61bea..0de58611a2e5c7 100644
--- a/clang/test/CodeGenCXX/vtable-pointer-initialization-address-space.cpp
+++ b/clang/test/CodeGenCXX/vtable-pointer-initialization-address-space.cpp
@@ -20,6 +20,13 @@ struct A : Base {
   Field field;
 };
 
+// CHECK: %struct.B = type <{ ptr addrspace(1), [8 x i8] }>
+// CHECK: %struct.B.base = type <{ ptr addrspace(1), i8 }>
+// CHECK: %struct.K = type { ptr addrspace(1) }
+// WITH-NONZERO-DEFAULT-AS: %struct.B = type <{ ptr addrspace(1), [8 x i8] }>
+// WITH-NONZERO-DEFAULT-AS: %struct.B.base = type <{ ptr addrspace(1), i8 }>
+// WITH-NONZERO-DEFAULT-AS: %struct.K = type { ptr addrspace(1) }
+
 // CHECK-LABEL: define{{.*}} void @_ZN1AC2Ev(ptr {{[^,]*}} %this) unnamed_addr
 // CHECK: call void @_ZN4BaseC2Ev(
 // CHECK: store ptr addrspace(1) getelementptr inbounds inrange(-16, 8) (i8, ptr addrspace(1) @_ZTV1A, i64 16)
@@ -65,3 +72,13 @@ void f() { B b; }
 // CHECK: call void @_ZN4BaseD2Ev(
 // CHECK: ret void
 // WITH-NONZERO-DEFAULT-AS-LABEL: define linkonce_odr{{.*}} void @_ZN1BD2Ev(ptr addrspace(4) {{[^,]*}} %this) unnamed_addr
+
+struct K {
+  virtual void g();
+};
+
+struct C : B, K {
+  double x;
+};
+
+void g() { C c; }

``````````

</details>


https://github.com/llvm/llvm-project/pull/235794


More information about the cfe-commits mailing list