dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Sema] Ensure an auto non-type template parameter is dependent 

The dependent auto was getting stripped away while rebuilding the template
parameter type, so substitute it in.

rdar://41852459

Differential revision: https://reviews.llvm.org/D50088

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@339198 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Erik Pilkington 2018-08-07 22:59:02 +00:00
parent 5c696accea
commit e7a60053bd
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Sema/SemaTemplate.cpp
View File

@ -974,7 +974,7 @@ NamedDecl *Sema::ActOnTypeParameter(Scope *S, bool Typename,
QualType Sema::CheckNonTypeTemplateParameterType(TypeSourceInfo *&TSI,
SourceLocation Loc) {
if (TSI->getType()->isUndeducedType()) {
// C++1z [temp.dep.expr]p3:
// C++17 [temp.dep.expr]p3:
// An id-expression is type-dependent if it contains
// - an identifier associated by name lookup with a non-type
// template-parameter declared with a type that contains a
@ -9866,6 +9866,15 @@ bool Sema::RebuildTemplateParamsInCurrentInstantiation(
if (!NewTSI)
return true;
if (NewTSI->getType()->isUndeducedType()) {
// C++17 [temp.dep.expr]p3:
// An id-expression is type-dependent if it contains
// - an identifier associated by name lookup with a non-type
// template-parameter declared with a type that contains a
// placeholder type (7.1.7.4),
NewTSI = SubstAutoTypeSourceInfo(NewTSI, Context.DependentTy);
}
if (NewTSI != NTTP->getTypeSourceInfo()) {
NTTP->setTypeSourceInfo(NewTSI);
NTTP->setType(NewTSI->getType());

43
test/SemaTemplate/temp_arg_nontype_cxx1z.cpp
View File

@ -335,3 +335,46 @@ namespace Nested {
void g(int, int);
using Int = A<int>::B<&g>::param2;
}
namespace rdar41852459 {
template <auto V> struct G {};
template <class T> struct S {
template <auto V> void f() {
G<V> x;
}
template <auto *PV> void f2() {
G<PV> x;
}
template <decltype(auto) V> void f3() {
G<V> x;
}
};
template <auto *PV> struct I {};
template <class T> struct K {
template <auto *PV> void f() {
I<PV> x;
}
template <auto V> void f2() {
I<V> x;
}
template <decltype(auto) V> void f3() {
I<V> x;
}
};
template <decltype(auto)> struct L {};
template <class T> struct M {
template <auto *PV> void f() {
L<PV> x;
}
template <auto V> void f() {
L<V> x;
}
template <decltype(auto) V> void f() {
L<V> x;
}
};
}