Author: yaxunl Date: Thu Nov 8 08:55:46 2018 New Revision: 346413 URL: http://llvm.org/viewvc/llvm-project?rev=346413&view=rev Log: Fix bitcast to address space cast for coerced load/stores
Coerced load/stores through memory do not take into account potential address space differences when it creates its bitcasts. Patch by David Salinas. Differential Revision: https://reviews.llvm.org/D53780 Added: cfe/trunk/test/CodeGenCXX/address-space-cast-coerce.cpp Modified: cfe/trunk/lib/CodeGen/CGCall.cpp Modified: cfe/trunk/lib/CodeGen/CGCall.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=346413&r1=346412&r2=346413&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGCall.cpp (original) +++ cfe/trunk/lib/CodeGen/CGCall.cpp Thu Nov 8 08:55:46 2018 @@ -1253,8 +1253,8 @@ static llvm::Value *CreateCoercedLoad(Ad // Otherwise do coercion through memory. This is stupid, but simple. Address Tmp = CreateTempAllocaForCoercion(CGF, Ty, Src.getAlignment()); - Address Casted = CGF.Builder.CreateBitCast(Tmp, CGF.AllocaInt8PtrTy); - Address SrcCasted = CGF.Builder.CreateBitCast(Src, CGF.AllocaInt8PtrTy); + Address Casted = CGF.Builder.CreateElementBitCast(Tmp,CGF.Int8Ty); + Address SrcCasted = CGF.Builder.CreateElementBitCast(Src,CGF.Int8Ty); CGF.Builder.CreateMemCpy(Casted, SrcCasted, llvm::ConstantInt::get(CGF.IntPtrTy, SrcSize), false); @@ -1335,8 +1335,8 @@ static void CreateCoercedStore(llvm::Val // to that information. Address Tmp = CreateTempAllocaForCoercion(CGF, SrcTy, Dst.getAlignment()); CGF.Builder.CreateStore(Src, Tmp); - Address Casted = CGF.Builder.CreateBitCast(Tmp, CGF.AllocaInt8PtrTy); - Address DstCasted = CGF.Builder.CreateBitCast(Dst, CGF.AllocaInt8PtrTy); + Address Casted = CGF.Builder.CreateElementBitCast(Tmp,CGF.Int8Ty); + Address DstCasted = CGF.Builder.CreateElementBitCast(Dst,CGF.Int8Ty); CGF.Builder.CreateMemCpy(DstCasted, Casted, llvm::ConstantInt::get(CGF.IntPtrTy, DstSize), false); Added: cfe/trunk/test/CodeGenCXX/address-space-cast-coerce.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/address-space-cast-coerce.cpp?rev=346413&view=auto ============================================================================== --- cfe/trunk/test/CodeGenCXX/address-space-cast-coerce.cpp (added) +++ cfe/trunk/test/CodeGenCXX/address-space-cast-coerce.cpp Thu Nov 8 08:55:46 2018 @@ -0,0 +1,53 @@ +// RUN: %clang_cc1 %s -triple=amdgcn-amd-amdhsa -emit-llvm -o - | FileCheck %s + +template<typename T, unsigned int n> struct my_vector_base; + + template<typename T> + struct my_vector_base<T, 1> { + typedef T Native_vec_ __attribute__((ext_vector_type(1))); + + union { + Native_vec_ data; + struct { + T x; + }; + }; + }; + + template<typename T, unsigned int rank> + struct my_vector_type : public my_vector_base<T, rank> { + using my_vector_base<T, rank>::data; + using typename my_vector_base<T, rank>::Native_vec_; + + template< typename U> + my_vector_type(U x) noexcept + { + for (auto i = 0u; i != rank; ++i) data[i] = x; + } + my_vector_type& operator+=(const my_vector_type& x) noexcept + { + data += x.data; + return *this; + } + }; + +template<typename T, unsigned int n> + inline + my_vector_type<T, n> operator+( + const my_vector_type<T, n>& x, const my_vector_type<T, n>& y) noexcept + { + return my_vector_type<T, n>{x} += y; + } + +using char1 = my_vector_type<char, 1>; + +int mane() { + + char1 f1{1}; + char1 f2{1}; + +// CHECK: %[[a:[^ ]+]] = addrspacecast i16 addrspace(5)* %{{[^ ]+}} to i16* +// CHECK: %[[a:[^ ]+]] = addrspacecast %{{[^ ]+}} addrspace(5)* %{{[^ ]+}} to %{{[^ ]+}} + + char1 f3 = f1 + f2; +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
