From c8e7113a9f6c6c3cf6d6c465f073dd487993d87d Mon Sep 17 00:00:00 2001 From: Anders Carlsson <andersca@mac.com> Date: Fri, 5 Jun 2009 04:47:51 +0000 Subject: [PATCH] Make the TemplateArgumentList take a TemplateArgumentListBuilder. llvm-svn: 72917 --- clang/include/clang/AST/DeclTemplate.h | 5 ++--- clang/lib/AST/DeclTemplate.cpp | 19 +++++++++---------- clang/lib/Sema/SemaTemplate.cpp | 14 ++++++-------- clang/lib/Sema/SemaTemplateDeduction.cpp | 10 ++++++++-- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/clang/include/clang/AST/DeclTemplate.h b/clang/include/clang/AST/DeclTemplate.h index 1d5736a783f0..3028c4d317a1 100644 --- a/clang/include/clang/AST/DeclTemplate.h +++ b/clang/include/clang/AST/DeclTemplate.h @@ -605,9 +605,8 @@ class TemplateArgumentList { public: TemplateArgumentList(ASTContext &Context, - TemplateArgument *TemplateArgs, - unsigned NumTemplateArgs, - bool CopyArgs); + TemplateArgumentListBuilder &Builder, + bool CopyArgs, bool FlattenArgs); ~TemplateArgumentList(); diff --git a/clang/lib/AST/DeclTemplate.cpp b/clang/lib/AST/DeclTemplate.cpp index e491fc4de1c1..fbaaf4de7f72 100644 --- a/clang/lib/AST/DeclTemplate.cpp +++ b/clang/lib/AST/DeclTemplate.cpp @@ -239,25 +239,25 @@ TemplateArgument::TemplateArgument(Expr *E) : Kind(Expression) { // TemplateArgumentList Implementation //===----------------------------------------------------------------------===// TemplateArgumentList::TemplateArgumentList(ASTContext &Context, - TemplateArgument *TemplateArgs, - unsigned NumTemplateArgs, - bool CopyArgs) - : NumArguments(NumTemplateArgs) { + TemplateArgumentListBuilder &Builder, + bool CopyArgs, bool FlattenArgs) + : NumArguments(Builder.flatSize()) { if (!CopyArgs) { - Arguments.setPointer(TemplateArgs); + Arguments.setPointer(Builder.getFlatArgumentList()); Arguments.setInt(1); return; } - unsigned Size = sizeof(TemplateArgument) * NumTemplateArgs; + + unsigned Size = sizeof(TemplateArgument) * Builder.flatSize(); unsigned Align = llvm::AlignOf<TemplateArgument>::Alignment; void *Mem = Context.Allocate(Size, Align); Arguments.setPointer((TemplateArgument *)Mem); Arguments.setInt(0); TemplateArgument *Args = (TemplateArgument *)Mem; - for (unsigned I = 0; I != NumTemplateArgs; ++I) - new (Args + I) TemplateArgument(TemplateArgs[I]); + for (unsigned I = 0; I != NumArguments; ++I) + new (Args + I) TemplateArgument(Builder.getFlatArgumentList()[I]); } TemplateArgumentList::~TemplateArgumentList() { @@ -279,8 +279,7 @@ ClassTemplateSpecializationDecl(ASTContext &Context, Kind DK, // class template specializations? SpecializedTemplate->getIdentifier()), SpecializedTemplate(SpecializedTemplate), - TemplateArgs(Context, Builder.getFlatArgumentList(), Builder.flatSize(), - /*CopyArgs=*/true), + TemplateArgs(Context, Builder, /*CopyArgs=*/true, /*FlattenArgs=*/true), SpecializationKind(TSK_Undeclared) { } diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index 42483e419f9a..660f54ca78fd 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -1007,10 +1007,9 @@ bool Sema::CheckTemplateArgumentList(TemplateDecl *Template, Converted.flatSize(), SourceRange(TemplateLoc, RAngleLoc)); - TemplateArgumentList TemplateArgs(Context, - Converted.getFlatArgumentList(), - Converted.flatSize(), - /*CopyArgs=*/false); + TemplateArgumentList TemplateArgs(Context, Converted, + /*CopyArgs=*/false, + /*FlattenArgs=*/false); ArgType = InstantiateType(ArgType, TemplateArgs, TTP->getDefaultArgumentLoc(), TTP->getDeclName()); @@ -1079,10 +1078,9 @@ bool Sema::CheckTemplateArgumentList(TemplateDecl *Template, Converted.flatSize(), SourceRange(TemplateLoc, RAngleLoc)); - TemplateArgumentList TemplateArgs(Context, - Converted.getFlatArgumentList(), - Converted.flatSize(), - /*CopyArgs=*/false); + TemplateArgumentList TemplateArgs(Context, Converted, + /*CopyArgs=*/false, + /*FlattenArgs=*/false); NTTPType = InstantiateType(NTTPType, TemplateArgs, NTTP->getLocation(), NTTP->getDeclName()); diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp index 87968bf06522..59793fe4c028 100644 --- a/clang/lib/Sema/SemaTemplateDeduction.cpp +++ b/clang/lib/Sema/SemaTemplateDeduction.cpp @@ -384,6 +384,12 @@ Sema::DeduceTemplateArguments(ClassTemplatePartialSpecializationDecl *Partial, } } - return new (Context) TemplateArgumentList(Context, Deduced.data(), - Deduced.size(), /*CopyArgs=*/true); + // FIXME: This is terrible. DeduceTemplateArguments should use a + // TemplateArgumentListBuilder directly. + TemplateArgumentListBuilder Builder; + for (unsigned I = 0, N = Deduced.size(); I != N; ++I) + Builder.push_back(Deduced[I]); + + return new (Context) TemplateArgumentList(Context, Builder, /*CopyArgs=*/true, + /*FlattenArgs=*/true); }