Cope with explicitly-specified function template arguments when there
are fewer template arguments than there are template parameters for that function. llvm-svn: 74578
This commit is contained in:
parent
86c7e20ca6
commit
e3f1f350ff
|
@ -2162,6 +2162,7 @@ public:
|
||||||
const TemplateArgument *TemplateArgs,
|
const TemplateArgument *TemplateArgs,
|
||||||
unsigned NumTemplateArgs,
|
unsigned NumTemplateArgs,
|
||||||
SourceLocation RAngleLoc,
|
SourceLocation RAngleLoc,
|
||||||
|
bool PartialTemplateArgs,
|
||||||
TemplateArgumentListBuilder &Converted);
|
TemplateArgumentListBuilder &Converted);
|
||||||
|
|
||||||
bool CheckTemplateTypeArgument(TemplateTypeParmDecl *Param,
|
bool CheckTemplateTypeArgument(TemplateTypeParmDecl *Param,
|
||||||
|
|
|
@ -852,7 +852,7 @@ QualType Sema::CheckTemplateIdType(TemplateName Name,
|
||||||
NumTemplateArgs);
|
NumTemplateArgs);
|
||||||
if (CheckTemplateArgumentList(Template, TemplateLoc, LAngleLoc,
|
if (CheckTemplateArgumentList(Template, TemplateLoc, LAngleLoc,
|
||||||
TemplateArgs, NumTemplateArgs, RAngleLoc,
|
TemplateArgs, NumTemplateArgs, RAngleLoc,
|
||||||
Converted))
|
false, Converted))
|
||||||
return QualType();
|
return QualType();
|
||||||
|
|
||||||
assert((Converted.structuredSize() ==
|
assert((Converted.structuredSize() ==
|
||||||
|
@ -1055,6 +1055,7 @@ bool Sema::CheckTemplateArgumentList(TemplateDecl *Template,
|
||||||
const TemplateArgument *TemplateArgs,
|
const TemplateArgument *TemplateArgs,
|
||||||
unsigned NumTemplateArgs,
|
unsigned NumTemplateArgs,
|
||||||
SourceLocation RAngleLoc,
|
SourceLocation RAngleLoc,
|
||||||
|
bool PartialTemplateArgs,
|
||||||
TemplateArgumentListBuilder &Converted) {
|
TemplateArgumentListBuilder &Converted) {
|
||||||
TemplateParameterList *Params = Template->getTemplateParameters();
|
TemplateParameterList *Params = Template->getTemplateParameters();
|
||||||
unsigned NumParams = Params->size();
|
unsigned NumParams = Params->size();
|
||||||
|
@ -1065,7 +1066,8 @@ bool Sema::CheckTemplateArgumentList(TemplateDecl *Template,
|
||||||
NumParams > 0 && Params->getParam(NumParams - 1)->isTemplateParameterPack();
|
NumParams > 0 && Params->getParam(NumParams - 1)->isTemplateParameterPack();
|
||||||
|
|
||||||
if ((NumArgs > NumParams && !HasParameterPack) ||
|
if ((NumArgs > NumParams && !HasParameterPack) ||
|
||||||
NumArgs < Params->getMinRequiredArguments()) {
|
(NumArgs < Params->getMinRequiredArguments() &&
|
||||||
|
!PartialTemplateArgs)) {
|
||||||
// FIXME: point at either the first arg beyond what we can handle,
|
// FIXME: point at either the first arg beyond what we can handle,
|
||||||
// or the '>', depending on whether we have too many or too few
|
// or the '>', depending on whether we have too many or too few
|
||||||
// arguments.
|
// arguments.
|
||||||
|
@ -1092,6 +1094,9 @@ bool Sema::CheckTemplateArgumentList(TemplateDecl *Template,
|
||||||
for (TemplateParameterList::iterator Param = Params->begin(),
|
for (TemplateParameterList::iterator Param = Params->begin(),
|
||||||
ParamEnd = Params->end();
|
ParamEnd = Params->end();
|
||||||
Param != ParamEnd; ++Param, ++ArgIdx) {
|
Param != ParamEnd; ++Param, ++ArgIdx) {
|
||||||
|
if (ArgIdx > NumArgs && PartialTemplateArgs)
|
||||||
|
break;
|
||||||
|
|
||||||
// Decode the template argument
|
// Decode the template argument
|
||||||
TemplateArgument Arg;
|
TemplateArgument Arg;
|
||||||
if (ArgIdx >= NumArgs) {
|
if (ArgIdx >= NumArgs) {
|
||||||
|
@ -2338,7 +2343,7 @@ Sema::ActOnClassTemplateSpecialization(Scope *S, unsigned TagSpec, TagKind TK,
|
||||||
TemplateArgs.size());
|
TemplateArgs.size());
|
||||||
if (CheckTemplateArgumentList(ClassTemplate, TemplateNameLoc, LAngleLoc,
|
if (CheckTemplateArgumentList(ClassTemplate, TemplateNameLoc, LAngleLoc,
|
||||||
TemplateArgs.data(), TemplateArgs.size(),
|
TemplateArgs.data(), TemplateArgs.size(),
|
||||||
RAngleLoc, Converted))
|
RAngleLoc, false, Converted))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
assert((Converted.structuredSize() ==
|
assert((Converted.structuredSize() ==
|
||||||
|
@ -2633,7 +2638,7 @@ Sema::ActOnExplicitInstantiation(Scope *S, SourceLocation TemplateLoc,
|
||||||
TemplateArgs.size());
|
TemplateArgs.size());
|
||||||
if (CheckTemplateArgumentList(ClassTemplate, TemplateNameLoc, LAngleLoc,
|
if (CheckTemplateArgumentList(ClassTemplate, TemplateNameLoc, LAngleLoc,
|
||||||
TemplateArgs.data(), TemplateArgs.size(),
|
TemplateArgs.data(), TemplateArgs.size(),
|
||||||
RAngleLoc, Converted))
|
RAngleLoc, false, Converted))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
assert((Converted.structuredSize() ==
|
assert((Converted.structuredSize() ==
|
||||||
|
|
|
@ -934,21 +934,24 @@ Sema::DeduceTemplateArguments(FunctionTemplateDecl *FunctionTemplate,
|
||||||
// there are corresponding template-parameters.
|
// there are corresponding template-parameters.
|
||||||
TemplateArgumentListBuilder Builder(TemplateParams,
|
TemplateArgumentListBuilder Builder(TemplateParams,
|
||||||
NumExplicitTemplateArgs);
|
NumExplicitTemplateArgs);
|
||||||
|
|
||||||
|
// Enter a new template instantiation context where we check the
|
||||||
|
// explicitly-specified template arguments against this function template,
|
||||||
|
// and then substitute them into the function parameter types.
|
||||||
|
InstantiatingTemplate Inst(*this, FunctionTemplate->getLocation(),
|
||||||
|
FunctionTemplate, Deduced.data(), Deduced.size());
|
||||||
|
if (Inst)
|
||||||
|
return TDK_InstantiationDepth;
|
||||||
|
|
||||||
if (CheckTemplateArgumentList(FunctionTemplate,
|
if (CheckTemplateArgumentList(FunctionTemplate,
|
||||||
SourceLocation(), SourceLocation(),
|
SourceLocation(), SourceLocation(),
|
||||||
ExplicitTemplateArgs,
|
ExplicitTemplateArgs,
|
||||||
NumExplicitTemplateArgs,
|
NumExplicitTemplateArgs,
|
||||||
SourceLocation(),
|
SourceLocation(),
|
||||||
|
true,
|
||||||
Builder) || Trap.hasErrorOccurred())
|
Builder) || Trap.hasErrorOccurred())
|
||||||
return TDK_InvalidExplicitArguments;
|
return TDK_InvalidExplicitArguments;
|
||||||
|
|
||||||
// Enter a new template instantiation context for the substitution of the
|
|
||||||
// explicitly-specified template arguments into the
|
|
||||||
InstantiatingTemplate Inst(*this, FunctionTemplate->getLocation(),
|
|
||||||
FunctionTemplate, Deduced.data(), Deduced.size());
|
|
||||||
if (Inst)
|
|
||||||
return TDK_InstantiationDepth;
|
|
||||||
|
|
||||||
// Form the template argument list from the explicitly-specified
|
// Form the template argument list from the explicitly-specified
|
||||||
// template arguments.
|
// template arguments.
|
||||||
TemplateArgumentList *ExplicitArgumentList
|
TemplateArgumentList *ExplicitArgumentList
|
||||||
|
|
|
@ -584,6 +584,15 @@ InstantiateTemplateTypeParmType(const TemplateTypeParmType *T) const {
|
||||||
if (T->getDepth() == 0) {
|
if (T->getDepth() == 0) {
|
||||||
// Replace the template type parameter with its corresponding
|
// Replace the template type parameter with its corresponding
|
||||||
// template argument.
|
// template argument.
|
||||||
|
|
||||||
|
// If the corresponding template argument is NULL or doesn't exist, it's
|
||||||
|
// because we are performing instantiation from explicitly-specified
|
||||||
|
// template arguments in a function template class, but there were some
|
||||||
|
// arguments left unspecified.
|
||||||
|
if (T->getIndex() >= TemplateArgs.size() ||
|
||||||
|
TemplateArgs[T->getIndex()].isNull())
|
||||||
|
return QualType(T, 0); // Would be nice to keep the original type here
|
||||||
|
|
||||||
assert(TemplateArgs[T->getIndex()].getKind() == TemplateArgument::Type &&
|
assert(TemplateArgs[T->getIndex()].getKind() == TemplateArgument::Type &&
|
||||||
"Template argument kind mismatch");
|
"Template argument kind mismatch");
|
||||||
return TemplateArgs[T->getIndex()].getAsType();
|
return TemplateArgs[T->getIndex()].getAsType();
|
||||||
|
|
|
@ -139,8 +139,17 @@ TemplateExprInstantiator::VisitDeclRefExpr(DeclRefExpr *E) {
|
||||||
NamedDecl *D = E->getDecl();
|
NamedDecl *D = E->getDecl();
|
||||||
if (NonTypeTemplateParmDecl *NTTP = dyn_cast<NonTypeTemplateParmDecl>(D)) {
|
if (NonTypeTemplateParmDecl *NTTP = dyn_cast<NonTypeTemplateParmDecl>(D)) {
|
||||||
assert(NTTP->getDepth() == 0 && "No nested templates yet");
|
assert(NTTP->getDepth() == 0 && "No nested templates yet");
|
||||||
const TemplateArgument &Arg = TemplateArgs[NTTP->getPosition()];
|
|
||||||
|
|
||||||
|
// If the corresponding template argument is NULL or non-existent, it's
|
||||||
|
// because we are performing instantiation from explicitly-specified
|
||||||
|
// template arguments in a function template, but there were some
|
||||||
|
// arguments left unspecified.
|
||||||
|
if (NTTP->getPosition() >= TemplateArgs.size() ||
|
||||||
|
TemplateArgs[NTTP->getPosition()].isNull())
|
||||||
|
return SemaRef.Owned(E); // FIXME: Clone the expression!
|
||||||
|
|
||||||
|
const TemplateArgument &Arg = TemplateArgs[NTTP->getPosition()];
|
||||||
|
|
||||||
// The template argument itself might be an expression, in which
|
// The template argument itself might be an expression, in which
|
||||||
// case we just return that expression.
|
// case we just return that expression.
|
||||||
if (Arg.getKind() == TemplateArgument::Expression)
|
if (Arg.getKind() == TemplateArgument::Expression)
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
// RUN: clang-cc -fsyntax-only -verify %s
|
||||||
|
|
||||||
|
template<class X, class Y, class Z> X f(Y,Z);
|
||||||
|
|
||||||
|
void g() {
|
||||||
|
f<int,char*,double>("aa",3.0);
|
||||||
|
f<int,char*>("aa",3.0); // Z is deduced to be double
|
||||||
|
f<int>("aa",3.0); // Y is deduced to be char*, and
|
||||||
|
// Z is deduced to be double
|
||||||
|
f("aa",3.0); // expected-error{{no matching}}
|
||||||
|
}
|
Loading…
Reference in New Issue