maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make the TemplateArgumentList take a TemplateArgumentListBuilder. 

llvm-svn: 72917
This commit is contained in:
Anders Carlsson 2009-06-05 04:47:51 +00:00
parent 1b28c3efe2
commit c8e7113a9f
4 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/include/clang/AST/DeclTemplate.h
View File

@ -605,9 +605,8 @@ class TemplateArgumentList {
public:
TemplateArgumentList(ASTContext &Context,
TemplateArgument *TemplateArgs,
unsigned NumTemplateArgs,
bool CopyArgs);
TemplateArgumentListBuilder &Builder,
bool CopyArgs, bool FlattenArgs);
~TemplateArgumentList();

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

@ -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) {
}

14
clang/lib/Sema/SemaTemplate.cpp
View File

@ -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());

10
clang/lib/Sema/SemaTemplateDeduction.cpp
View File

@ -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);
}