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

Move handling of template parameter packs out of the 

template-type-parameter specific template argument checking code and
up to the template argument checking loop. In theory, this should make
variadic templates work better; in practice, they don't well enough
for us to care anyway (YET!), so this is mostly a re-organization to
simplify CheckTemplateArgument.

llvm-svn: 86868
This commit is contained in:
Douglas Gregor 2009-11-11 19:41:09 +00:00
parent 4f7fd3baeb
commit eebed72fbb
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Sema/Sema.h
View File

@ -2587,12 +2587,8 @@ public:
bool CheckTemplateArgument(NamedDecl *Param,
const TemplateArgumentLoc &Arg,
unsigned ArgIdx,
TemplateDecl *Template,
SourceLocation TemplateLoc,
SourceLocation LAngleLoc,
const TemplateArgumentLoc *TemplateArgs,
unsigned NumTemplateArgs,
SourceLocation RAngleLoc,
TemplateArgumentListBuilder &Converted);

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

@ -1610,34 +1610,16 @@ SubstDefaultTemplateArgument(Sema &SemaRef,
/// template parameter.
bool Sema::CheckTemplateArgument(NamedDecl *Param,
const TemplateArgumentLoc &Arg,
unsigned ArgIdx,
TemplateDecl *Template,
SourceLocation TemplateLoc,
SourceLocation LAngleLoc,
const TemplateArgumentLoc *TemplateArgs,
unsigned NumTemplateArgs,
SourceLocation RAngleLoc,
TemplateArgumentListBuilder &Converted) {
if (TemplateTypeParmDecl *TTP = dyn_cast<TemplateTypeParmDecl>(Param)) {
// Check template type parameters.
if (TTP->isParameterPack()) {
// Check all the remaining arguments (if any).
Converted.BeginPack();
for (; ArgIdx < NumTemplateArgs; ++ArgIdx) {
if (CheckTemplateTypeArgument(TTP, TemplateArgs[ArgIdx], Converted))
return true;
}
Converted.EndPack();
return false;
}
// Check template type parameters.
if (TemplateTypeParmDecl *TTP = dyn_cast<TemplateTypeParmDecl>(Param))
return CheckTemplateTypeArgument(TTP, Arg, Converted);
}
if (NonTypeTemplateParmDecl *NTTP =dyn_cast<NonTypeTemplateParmDecl>(Param)) {
// Check non-type template parameters.
// Check non-type template parameters.
if (NonTypeTemplateParmDecl *NTTP =dyn_cast<NonTypeTemplateParmDecl>(Param)) {
// Do substitution on the type of the non-type template parameter
// with the template arguments we've seen thus far.
QualType NTTPType = NTTP->getType();
@ -1740,7 +1722,7 @@ bool Sema::CheckTemplateArgument(NamedDecl *Param,
}
case TemplateArgument::Pack:
assert(0 && "FIXME: Implement!");
llvm::llvm_unreachable("Caller must expand template argument packs");
break;
}
@ -1802,7 +1784,7 @@ bool Sema::CheckTemplateArgument(NamedDecl *Param,
break;
case TemplateArgument::Pack:
assert(0 && "FIXME: Implement!");
llvm::llvm_unreachable("Caller must expand template argument packs");
break;
}
@ -1859,6 +1841,21 @@ bool Sema::CheckTemplateArgumentList(TemplateDecl *Template,
if (ArgIdx > NumArgs && PartialTemplateArgs)
break;
// If we have a template parameter pack, check every remaining template
// argument against that template parameter pack.
if ((*Param)->isTemplateParameterPack()) {
Converted.BeginPack();
for (; ArgIdx < NumArgs; ++ArgIdx) {
if (CheckTemplateArgument(*Param, TemplateArgs[ArgIdx], Template,
TemplateLoc, RAngleLoc, Converted)) {
Invalid = true;
break;
}
}
Converted.EndPack();
continue;
}
// Decode the template argument
TemplateArgumentLoc Arg;
@ -1926,8 +1923,7 @@ bool Sema::CheckTemplateArgumentList(TemplateDecl *Template,
Arg = TemplateArgs[ArgIdx];
}
if (CheckTemplateArgument(*Param, Arg, ArgIdx, Template, TemplateLoc,
LAngleLoc, TemplateArgs, NumTemplateArgs,
if (CheckTemplateArgument(*Param, Arg, Template, TemplateLoc,
RAngleLoc, Converted))
return true;
}