Author: Anastasia Stulova Date: 2020-07-27T15:18:49+01:00 New Revision: 92fa91bb402921a5705507c38f583e9b8e9d84e4
URL: https://github.com/llvm/llvm-project/commit/92fa91bb402921a5705507c38f583e9b8e9d84e4 DIFF: https://github.com/llvm/llvm-project/commit/92fa91bb402921a5705507c38f583e9b8e9d84e4.diff LOG: [OpenCL] Fixed missing address space for templated copy constructor. Added missing address space for the parameter of copy ctor created for templated constructor with an R-value reference. Patch by Ole Strohm (olestrohm)! Tags: #clang Differential Revision: https://reviews.llvm.org/D83665 Added: Modified: clang/lib/Sema/SemaTemplateDeduction.cpp clang/test/SemaOpenCLCXX/address-space-templates.cl Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp index 52062e9a5039..8e7b4e1655ea 100644 --- a/clang/lib/Sema/SemaTemplateDeduction.cpp +++ b/clang/lib/Sema/SemaTemplateDeduction.cpp @@ -3815,8 +3815,11 @@ static bool AdjustFunctionParmAndArgTypesForDeduction( // If P is a forwarding reference and the argument is an lvalue, the type // "lvalue reference to A" is used in place of A for type deduction. if (isForwardingReference(QualType(ParamRefType, 0), FirstInnerIndex) && - Arg->isLValue()) + Arg->isLValue()) { + if (S.getLangOpts().OpenCL) + ArgType = S.Context.getAddrSpaceQualType(ArgType, LangAS::opencl_generic); ArgType = S.Context.getLValueReferenceType(ArgType); + } } else { // C++ [temp.deduct.call]p2: // If P is not a reference type: diff --git a/clang/test/SemaOpenCLCXX/address-space-templates.cl b/clang/test/SemaOpenCLCXX/address-space-templates.cl index 6b304d2fdda4..be187de5684b 100644 --- a/clang/test/SemaOpenCLCXX/address-space-templates.cl +++ b/clang/test/SemaOpenCLCXX/address-space-templates.cl @@ -22,10 +22,28 @@ void foo3() { __private T ii; // expected-error{{conflicting address space qualifiers are provided between types '__private T' and '__global int'}} } +template <class _Tp> struct remove_reference { typedef _Tp type; }; +template <class _Tp> struct remove_reference<_Tp &> { typedef _Tp type; }; +template <class _Tp> struct as_pointer { + typedef typename remove_reference<_Tp>::type* type; +}; + +struct rep { + // CHECK |-CXXConstructorDecl {{.*}} rep 'void (const __generic rep &__private) __generic' + template<class U, class = typename as_pointer<U>::type> + rep(U&& v) {} +}; + +struct rep_outer : private rep { + rep_outer() + : rep(0) {} +}; + void bar() { S<const __global int> sintgl; // expected-note{{in instantiation of template class 'S<const __global int>' requested here}} foo1<__local int>(1); // expected-error{{no matching function for call to 'foo1'}} foo2<__global int>(0); foo3<__global int>(); // expected-note{{in instantiation of function template specialization 'foo3<__global int>' requested here}} + rep_outer r; } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
