Author: svenvh Date: Thu Oct 17 07:12:51 2019 New Revision: 375118 URL: http://llvm.org/viewvc/llvm-project?rev=375118&view=rev Log: [OpenCL] Preserve addrspace in CGClass (PR43145)
PR43145 revealed two places where Clang was attempting to create a bitcast without considering the address space of class types during C++ class code generation. Differential Revision: https://reviews.llvm.org/D68403 Modified: cfe/trunk/lib/CodeGen/CGClass.cpp cfe/trunk/test/CodeGenOpenCLCXX/addrspace-derived-base.cl Modified: cfe/trunk/lib/CodeGen/CGClass.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGClass.cpp?rev=375118&r1=375117&r2=375118&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGClass.cpp (original) +++ cfe/trunk/lib/CodeGen/CGClass.cpp Thu Oct 17 07:12:51 2019 @@ -246,7 +246,8 @@ ApplyNonVirtualAndVirtualOffset(CodeGenF // 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 @@ CodeGenFunction::GetAddressOfDerivedClas 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); Modified: cfe/trunk/test/CodeGenOpenCLCXX/addrspace-derived-base.cl URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenOpenCLCXX/addrspace-derived-base.cl?rev=375118&r1=375117&r2=375118&view=diff ============================================================================== --- cfe/trunk/test/CodeGenOpenCLCXX/addrspace-derived-base.cl (original) +++ cfe/trunk/test/CodeGenOpenCLCXX/addrspace-derived-base.cl Thu Oct 17 07:12:51 2019 @@ -11,6 +11,7 @@ public: 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 @@ void foo() { //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)* _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
