[cfe-commits] r72917 - in /cfe/trunk: include/clang/AST/DeclTemplate.h lib/AST/DeclTemplate.cpp lib/Sema/SemaTemplate.cpp lib/Sema/SemaTemplateDeduction.cpp
Anders Carlsson
andersca at mac.com
Thu Jun 4 21:47:52 PDT 2009
Author: andersca
Date: Thu Jun 4 23:47:51 2009
New Revision: 72917
URL: http://llvm.org/viewvc/llvm-project?rev=72917&view=rev
Log:
Make the TemplateArgumentList take a TemplateArgumentListBuilder.
Modified:
cfe/trunk/include/clang/AST/DeclTemplate.h
cfe/trunk/lib/AST/DeclTemplate.cpp
cfe/trunk/lib/Sema/SemaTemplate.cpp
cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp
Modified: cfe/trunk/include/clang/AST/DeclTemplate.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclTemplate.h?rev=72917&r1=72916&r2=72917&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/DeclTemplate.h (original)
+++ cfe/trunk/include/clang/AST/DeclTemplate.h Thu Jun 4 23:47:51 2009
@@ -605,9 +605,8 @@
public:
TemplateArgumentList(ASTContext &Context,
- TemplateArgument *TemplateArgs,
- unsigned NumTemplateArgs,
- bool CopyArgs);
+ TemplateArgumentListBuilder &Builder,
+ bool CopyArgs, bool FlattenArgs);
~TemplateArgumentList();
Modified: cfe/trunk/lib/AST/DeclTemplate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclTemplate.cpp?rev=72917&r1=72916&r2=72917&view=diff
==============================================================================
--- cfe/trunk/lib/AST/DeclTemplate.cpp (original)
+++ cfe/trunk/lib/AST/DeclTemplate.cpp Thu Jun 4 23:47:51 2009
@@ -239,25 +239,25 @@
// 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 @@
// 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) {
}
Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=72917&r1=72916&r2=72917&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Thu Jun 4 23:47:51 2009
@@ -1007,10 +1007,9 @@
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 @@
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());
Modified: cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp?rev=72917&r1=72916&r2=72917&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplateDeduction.cpp Thu Jun 4 23:47:51 2009
@@ -384,6 +384,12 @@
}
}
- 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);
}
More information about the cfe-commits
mailing list