From aafc0ccfcf860d921a86423c6c9a738301987abf Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Fri, 15 May 2009 19:11:46 +0000 Subject: [PATCH] Make sure that the type associated with a class template is dependent. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71878 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/DeclCXX.h | 3 ++- lib/AST/DeclCXX.cpp | 6 ++++-- lib/Sema/SemaTemplate.cpp | 11 ++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h index 88d6f9fa2b..28a6f2d367 100644 --- a/include/clang/AST/DeclCXX.h +++ b/include/clang/AST/DeclCXX.h @@ -264,7 +264,8 @@ public: static CXXRecordDecl *Create(ASTContext &C, TagKind TK, DeclContext *DC, SourceLocation L, IdentifierInfo *Id, - CXXRecordDecl* PrevDecl=0); + CXXRecordDecl* PrevDecl=0, + bool DelayTypeCreation = false); /// setBases - Sets the base classes of this struct or class. void setBases(CXXBaseSpecifier const * const *Bases, unsigned NumBases); diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp index c32aefb830..361fef0325 100644 --- a/lib/AST/DeclCXX.cpp +++ b/lib/AST/DeclCXX.cpp @@ -35,9 +35,11 @@ CXXRecordDecl::CXXRecordDecl(Kind K, TagKind TK, DeclContext *DC, CXXRecordDecl *CXXRecordDecl::Create(ASTContext &C, TagKind TK, DeclContext *DC, SourceLocation L, IdentifierInfo *Id, - CXXRecordDecl* PrevDecl) { + CXXRecordDecl* PrevDecl, + bool DelayTypeCreation) { CXXRecordDecl* R = new (C) CXXRecordDecl(CXXRecord, TK, DC, L, Id); - C.getTypeDeclType(R, PrevDecl); + if (!DelayTypeCreation) + C.getTypeDeclType(R, PrevDecl); return R; } diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index 09e32f7b65..afd801cf61 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -509,7 +509,8 @@ Sema::ActOnClassTemplate(Scope *S, unsigned TagSpec, TagKind TK, CXXRecordDecl *NewClass = CXXRecordDecl::Create(Context, Kind, SemanticContext, NameLoc, Name, PrevClassTemplate? - PrevClassTemplate->getTemplatedDecl() : 0); + PrevClassTemplate->getTemplatedDecl() : 0, + /*DelayTypeCreation=*/true); ClassTemplateDecl *NewTemplate = ClassTemplateDecl::Create(Context, SemanticContext, NameLoc, @@ -517,6 +518,14 @@ Sema::ActOnClassTemplate(Scope *S, unsigned TagSpec, TagKind TK, NewClass, PrevClassTemplate); NewClass->setDescribedClassTemplate(NewTemplate); + // Build the type for the class template declaration now. + QualType T = + Context.getTypeDeclType(NewClass, + PrevClassTemplate? + PrevClassTemplate->getTemplatedDecl() : 0); + assert(T->isDependentType() && "Class template type is not dependent?"); + (void)T; + // Set the access specifier. SetMemberAccessSpecifier(NewTemplate, PrevClassTemplate, AS); -- 2.40.0