replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix PR6156 and test several of the basic aspects of non-type template arguments 

when implicitly supplied to the injected class name.

llvm-svn: 94948
This commit is contained in:
Chandler Carruth 2010-01-31 07:24:03 +00:00
parent 9b1fa25432
commit 234c129fba
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/AST/DeclTemplate.cpp
View File

@ -213,7 +213,8 @@ QualType ClassTemplateDecl::getInjectedClassNameType(ASTContext &Context) {
TemplateArgs.push_back(TemplateArgument(ParamType));
} else if (NonTypeTemplateParmDecl *NTTP =
dyn_cast<NonTypeTemplateParmDecl>(*Param)) {
Expr *E = new (Context) DeclRefExpr(NTTP, NTTP->getType(),
Expr *E = new (Context) DeclRefExpr(NTTP,
NTTP->getType().getNonReferenceType(),
NTTP->getLocation());
TemplateArgs.push_back(TemplateArgument(E));
} else {

33
clang/test/CXX/temp/temp.res/temp.local/p1.cpp Normal file
View File

@ -0,0 +1,33 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
// C++0x [temp.local]p1:
// Like normal (non-template) classes, class templates have an
// injected-class-name (Clause 9). The injected-class-name can be used with
// or without a template-argument-list. When it is used without
// a template-argument-list, it is equivalent to the injected-class-name
// followed by the template-parameters of the class template enclosed in <>.
template <typename T> struct X0 {
X0();
~X0();
X0 f(const X0&);
};
// Test non-type template parameters.
template <int N1, const int& N2, const int* N3> struct X1 {
X1();
~X1();
X1 f(const X1& x1a) { X1 x1b(x1a); return x1b; }
};
// When it is used with a template-argument-list, it refers to the specified
// class template specialization, which could be the current specialization
// or another specialization.
// FIXME: Test this clause.
int i = 42;
int* iptr = &i;
void test() {
X0<int> x0; (void)x0;
X1<42, i, iptr> x1; (void)x1;
}