diff options
| -rw-r--r-- | lib/Sema/SemaTemplate.cpp | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaTemplate.h | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaTemplateDeduction.cpp | 24 | ||||
| -rw-r--r-- | lib/Sema/SemaType.cpp | 11 | ||||
| -rw-r--r-- | test/SemaTemplate/instantiate-member-template.cpp | 12 |
5 files changed, 31 insertions, 22 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index 4fa09d8fda..d72cea0907 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -1319,7 +1319,8 @@ bool Sema::CheckTemplateArgumentList(TemplateDecl *Template, TemplateArgumentList TemplateArgs(Context, Converted, /*TakeArgs=*/false); - NTTPType = SubstType(NTTPType, TemplateArgs, + NTTPType = SubstType(NTTPType, + MultiLevelTemplateArgumentList(TemplateArgs), NTTP->getLocation(), NTTP->getDeclName()); // If that worked, check the non-type template parameter type diff --git a/lib/Sema/SemaTemplate.h b/lib/Sema/SemaTemplate.h index b400cb3aba..59bb54233e 100644 --- a/lib/Sema/SemaTemplate.h +++ b/lib/Sema/SemaTemplate.h @@ -38,7 +38,7 @@ namespace clang { /// template argument list (17) at depth 1. struct MultiLevelTemplateArgumentList { /// \brief The template argument lists, stored from the innermost template - /// argument list (first) to the outermost template argument list (last) + /// argument list (first) to the outermost template argument list (last). llvm::SmallVector<const TemplateArgumentList *, 4> TemplateArgumentLists; public: @@ -46,6 +46,7 @@ namespace clang { MultiLevelTemplateArgumentList() { } /// \brief Construct a single-level template argument list. + explicit MultiLevelTemplateArgumentList(const TemplateArgumentList &TemplateArgs) { TemplateArgumentLists.push_back(&TemplateArgs); } diff --git a/lib/Sema/SemaTemplateDeduction.cpp b/lib/Sema/SemaTemplateDeduction.cpp index ec198e0ffb..2253a4e6a7 100644 --- a/lib/Sema/SemaTemplateDeduction.cpp +++ b/lib/Sema/SemaTemplateDeduction.cpp @@ -967,8 +967,9 @@ Sema::DeduceTemplateArguments(ClassTemplatePartialSpecializationDecl *Partial, for (unsigned I = 0, N = PartialTemplateArgs.flat_size(); I != N; ++I) { Decl *Param = const_cast<Decl *>( ClassTemplate->getTemplateParameters()->getParam(I)); - TemplateArgument InstArg = Subst(PartialTemplateArgs[I], - *DeducedArgumentList); + TemplateArgument InstArg + = Subst(PartialTemplateArgs[I], + MultiLevelTemplateArgumentList(*DeducedArgumentList)); if (InstArg.isNull()) { Info.Param = makeTemplateParameter(Param); Info.FirstArg = PartialTemplateArgs[I]; @@ -1118,10 +1119,10 @@ Sema::SubstituteExplicitTemplateArguments( PEnd = Function->param_end(); P != PEnd; ++P) { - QualType ParamType = SubstType((*P)->getType(), - *ExplicitArgumentList, - (*P)->getLocation(), - (*P)->getDeclName()); + QualType ParamType + = SubstType((*P)->getType(), + MultiLevelTemplateArgumentList(*ExplicitArgumentList), + (*P)->getLocation(), (*P)->getDeclName()); if (ParamType.isNull() || Trap.hasErrorOccurred()) return TDK_SubstitutionFailure; @@ -1136,10 +1137,11 @@ Sema::SubstituteExplicitTemplateArguments( = Function->getType()->getAsFunctionProtoType(); assert(Proto && "Function template does not have a prototype?"); - QualType ResultType = SubstType(Proto->getResultType(), - *ExplicitArgumentList, - Function->getTypeSpecStartLoc(), - Function->getDeclName()); + QualType ResultType + = SubstType(Proto->getResultType(), + MultiLevelTemplateArgumentList(*ExplicitArgumentList), + Function->getTypeSpecStartLoc(), + Function->getDeclName()); if (ResultType.isNull() || Trap.hasErrorOccurred()) return TDK_SubstitutionFailure; @@ -1215,7 +1217,7 @@ Sema::FinishTemplateArgumentDeduction(FunctionTemplateDecl *FunctionTemplate, Specialization = cast_or_null<FunctionDecl>( SubstDecl(FunctionTemplate->getTemplatedDecl(), FunctionTemplate->getDeclContext(), - *DeducedArgumentList)); + MultiLevelTemplateArgumentList(*DeducedArgumentList))); if (!Specialization) return TDK_SubstitutionFailure; diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp index 7837952353..284dea2b75 100644 --- a/lib/Sema/SemaType.cpp +++ b/lib/Sema/SemaType.cpp @@ -1787,14 +1787,9 @@ bool Sema::RequireCompleteType(SourceLocation Loc, QualType T, } else if (CXXRecordDecl *Rec = dyn_cast<CXXRecordDecl>(Record->getDecl())) { if (CXXRecordDecl *Pattern = Rec->getInstantiatedFromMemberClass()) { - // Find the class template specialization that surrounds this - // member class. - ClassTemplateSpecializationDecl *Spec = 0; - for (DeclContext *Parent = Rec->getDeclContext(); - Parent && !Spec; Parent = Parent->getParent()) - Spec = dyn_cast<ClassTemplateSpecializationDecl>(Parent); - assert(Spec && "Not a member of a class template specialization?"); - return InstantiateClass(Loc, Rec, Pattern, Spec->getTemplateArgs(), + // This record was instantiated from a class within a template. + return InstantiateClass(Loc, Rec, Pattern, + getTemplateInstantiationArgs(Rec), /*ExplicitInstantiation=*/false, /*Complain=*/diag != 0); } diff --git a/test/SemaTemplate/instantiate-member-template.cpp b/test/SemaTemplate/instantiate-member-template.cpp index eb6a450030..be5665b989 100644 --- a/test/SemaTemplate/instantiate-member-template.cpp +++ b/test/SemaTemplate/instantiate-member-template.cpp @@ -32,7 +32,14 @@ struct X1 { template<typename U> struct Inner1 { U x; // expected-error{{void}} - T y; + T y; + }; + + template<typename U> + struct Inner2 { + struct SuperInner { + U z; // expected-error{{void}} + }; }; }; @@ -42,4 +49,7 @@ void test_X1() { X1<int>::Inner1<void> *xivp; // okay X1<int>::Inner1<void> xiv; // expected-note{{instantiation}} + + X1<int>::Inner2<void>::SuperInner *xisivp; // okay + X1<int>::Inner2<void>::SuperInner xisiv; // expected-note{{instantiation}} } |