maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[OpenCL] Fix default address space in template argument deduction. 

When deducing a reference type for forwarding references prevent
adding default address space of a template argument if it is given.

This got reported in PR48896 because in OpenCL all parameters are
in private address space and therefore when we initialize a
forwarding reference with a parameter we should just inherit the
address space from it i.e. keep __private instead of __generic.

Tags: #clang

Differential Revision: https://reviews.llvm.org/D95624
This commit is contained in:
Anastasia Stulova 2021-02-04 13:46:11 +00:00
parent 09c18a6606
commit 0c65993be1
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Sema/SemaTemplateDeduction.cpp
View File

@ -3869,7 +3869,7 @@ static bool AdjustFunctionParmAndArgTypesForDeduction(
// "lvalue reference to A" is used in place of A for type deduction. // "lvalue reference to A" is used in place of A for type deduction.
if (isForwardingReference(QualType(ParamRefType, 0), FirstInnerIndex) && if (isForwardingReference(QualType(ParamRefType, 0), FirstInnerIndex) &&
Arg->isLValue()) { Arg->isLValue()) {
if (S.getLangOpts().OpenCL) if (S.getLangOpts().OpenCL && !ArgType.hasAddressSpace())
ArgType = S.Context.getAddrSpaceQualType(ArgType, LangAS::opencl_generic); ArgType = S.Context.getAddrSpaceQualType(ArgType, LangAS::opencl_generic);
ArgType = S.Context.getLValueReferenceType(ArgType); ArgType = S.Context.getLValueReferenceType(ArgType);
} }

17
clang/test/SemaOpenCLCXX/address-space-templates.cl
View File

@ -1,4 +1,4 @@
//RUN: %clang_cc1 %s -cl-std=clc++ -pedantic -verify -fsyntax-only //RUN: %clang_cc1 %s -cl-std=clc++ -pedantic -verify -ast-dump | FileCheck %s
template <typename T> template <typename T>
struct S { struct S {
@ -28,8 +28,10 @@ template <class _Tp> struct as_pointer {
typedef typename remove_reference<_Tp>::type* type; typedef typename remove_reference<_Tp>::type* type;
}; };
// Check address space deduction in template parameter deduction.
struct rep { struct rep {
// CHECK |-CXXConstructorDecl {{.*}} rep 'void (const __generic rep &__private) __generic' // When there is no address space on a reference use __generic.
// CHECK: |-CXXConstructorDecl {{.*}} rep 'void (const __generic rep &__private) __generic'
template<class U, class = typename as_pointer<U>::type> template<class U, class = typename as_pointer<U>::type>
rep(U&& v) {} rep(U&& v) {}
}; };
@ -39,11 +41,22 @@ struct rep_outer : private rep {
: rep(0) {} : rep(0) {}
}; };
template<class T, class F>
void foo4(T t, F f){
f(t);
}
void bar() { void bar() {
S<const __global int> sintgl; // expected-note{{in instantiation of template class 'S<const __global int>' requested here}} 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'}} foo1<__local int>(1); // expected-error{{no matching function for call to 'foo1'}}
foo2<__global int>(0); foo2<__global int>(0);
foo3<__global int>(); // expected-note{{in instantiation of function template specialization 'foo3<__global int>' requested here}} foo3<__global int>(); // expected-note{{in instantiation of function template specialization 'foo3<__global int>' requested here}}
rep_outer r; rep_outer r;
int i;
// Preserve the address space of the type in forwarding reference.
// CHECK: CXXMethodDecl {{.*}} operator() 'void (__private int &__private) const __generic'
foo4(i, [](auto&& x){;});
} }