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

Fix a bogus assertion after adjusting the type of a substituted 

non-type template argument for a non-type template parameter of
pointer type. Fixes PR6244.

llvm-svn: 95447
This commit is contained in:
Douglas Gregor 2010-02-05 22:49:09 +00:00
parent d91f302a05
commit d320e03eed
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Sema/SemaTemplateInstantiate.cpp
View File

@ -791,7 +791,9 @@ TemplateInstantiator::TransformDeclRefExpr(DeclRefExpr *E) {
return SemaRef.ExprError();
RefE = (Expr *)RefExpr.get();
assert(SemaRef.IsQualificationConversion(RefE->getType(),
assert(SemaRef.Context.hasSameUnqualifiedType(RefE->getType(),
NTTP->getType()) ||
SemaRef.IsQualificationConversion(RefE->getType(),
NTTP->getType()));
}

6
clang/test/CXX/temp/temp.arg/temp.arg.nontype/p5.cpp
View File

@ -46,6 +46,12 @@ namespace pointer_to_object_parameters {
A2<array_of_Xs> *a13;
A2<&an_X> *a13_2;
A2<(&an_X)> *a13_3; // expected-error{{non-type template argument cannot be surrounded by parentheses}}
// PR6244
struct X1 {} X1v;
template <X1*> struct X2 { };
template <X1* Value> struct X3 : X2<Value> { };
struct X4 : X3<&X1v> { };
}
// -- For a non-type template-parameter of type reference to object, no