[PATCH] D68403: [OpenCL] PR43145: preserve addrspace for class accesses
Sven van Haastregt via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Oct 17 07:12:23 PDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rGaf6248cbb9e7: [OpenCL] Preserve addrspace in CGClass (PR43145) (authored by svenvh).
Changed prior to commit:
https://reviews.llvm.org/D68403?vs=223037&id=225426#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D68403/new/
https://reviews.llvm.org/D68403
Files:
clang/lib/CodeGen/CGClass.cpp
clang/test/CodeGenOpenCLCXX/addrspace-derived-base.cl
Index: clang/test/CodeGenOpenCLCXX/addrspace-derived-base.cl
===================================================================
--- clang/test/CodeGenOpenCLCXX/addrspace-derived-base.cl
+++ clang/test/CodeGenOpenCLCXX/addrspace-derived-base.cl
@@ -11,6 +11,7 @@
void foo() {
D d;
+ //CHECK-LABEL: foo
//CHECK: addrspacecast %class.D* %d to %class.D addrspace(4)*
//CHECK: call spir_func i32 @_ZNU3AS41D5getmbEv(%class.D addrspace(4)*
d.getmb();
@@ -20,3 +21,32 @@
//CHECK: define linkonce_odr spir_func i32 @_ZNU3AS41D5getmbEv(%class.D addrspace(4)* %this)
//CHECK: bitcast %class.D addrspace(4)* %this1 to %struct.B addrspace(4)*
+
+
+// Calling base method through multiple inheritance.
+
+class B2 {
+ public:
+ void baseMethod() const { }
+ int bb;
+};
+
+class Derived : public B, public B2 {
+ public:
+ void work() const { baseMethod(); }
+ // CHECK-LABEL: work
+ // CHECK: bitcast i8 addrspace(4)* %add.ptr to %class.B2 addrspace(4)*
+};
+
+void pr43145(const Derived *argDerived) {
+ argDerived->work();
+}
+
+// Casting from base to derived.
+
+void pr43145_2(B *argB) {
+ Derived *x = (Derived*)argB;
+}
+
+// CHECK-LABEL: @_Z9pr43145_2
+// CHECK: bitcast %struct.B addrspace(4)* %0 to %class.Derived addrspace(4)*
Index: clang/lib/CodeGen/CGClass.cpp
===================================================================
--- clang/lib/CodeGen/CGClass.cpp
+++ clang/lib/CodeGen/CGClass.cpp
@@ -246,7 +246,8 @@
// Apply the base offset.
llvm::Value *ptr = addr.getPointer();
- ptr = CGF.Builder.CreateBitCast(ptr, CGF.Int8PtrTy);
+ unsigned AddrSpace = ptr->getType()->getPointerAddressSpace();
+ ptr = CGF.Builder.CreateBitCast(ptr, CGF.Int8Ty->getPointerTo(AddrSpace));
ptr = CGF.Builder.CreateInBoundsGEP(ptr, baseOffset, "add.ptr");
// If we have a virtual component, the alignment of the result will
@@ -381,7 +382,9 @@
QualType DerivedTy =
getContext().getCanonicalType(getContext().getTagDeclType(Derived));
- llvm::Type *DerivedPtrTy = ConvertType(DerivedTy)->getPointerTo();
+ unsigned AddrSpace =
+ BaseAddr.getPointer()->getType()->getPointerAddressSpace();
+ llvm::Type *DerivedPtrTy = ConvertType(DerivedTy)->getPointerTo(AddrSpace);
llvm::Value *NonVirtualOffset =
CGM.GetNonVirtualBaseClassOffset(Derived, PathBegin, PathEnd);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D68403.225426.patch
Type: text/x-patch
Size: 2336 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20191017/f33cac86/attachment.bin>
More information about the cfe-commits
mailing list