diff options
author | Douglas Gregor <dgregor@apple.com> | 2010-12-23 01:52:01 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2010-12-23 01:52:01 +0000 |
commit | ca4d91d9f661159fbbca3b748ca2e8ccb3821b06 (patch) | |
tree | c5d33b4c4f6a6be1f86049956d23ba207105fab8 /clang/lib/Sema | |
parent | 18b762a94667c8b8c4b27c791404baaea71d49d1 (diff) | |
download | bcm5719-llvm-ca4d91d9f661159fbbca3b748ca2e8ccb3821b06.tar.gz bcm5719-llvm-ca4d91d9f661159fbbca3b748ca2e8ccb3821b06.zip |
Implement the part of C++0x [temp.arg.explicit]p3 that pertains to
parameter packs. In particular, a parameter pack not otherwise deduced
is deduced to an empty parameter pack.
The C++0x wording here is a bit unfortunate; this should really only
apply to function templates, and it mentions "trailing" parameter
packs, which doesn't really make sense in the context of function
templates. Will file a core issue separately.
llvm-svn: 122463
Diffstat (limited to 'clang/lib/Sema')
-rw-r--r-- | clang/lib/Sema/SemaTemplateDeduction.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp index ad649c067c6..90894f22a36 100644 --- a/clang/lib/Sema/SemaTemplateDeduction.cpp +++ b/clang/lib/Sema/SemaTemplateDeduction.cpp @@ -1708,9 +1708,10 @@ Sema::FinishTemplateArgumentDeduction(FunctionTemplateDecl *FunctionTemplate, // [...] or if any template argument remains neither deduced nor // explicitly specified, template argument deduction fails. llvm::SmallVector<TemplateArgument, 4> Builder; - for (unsigned I = 0, N = Deduced.size(); I != N; ++I) { + for (unsigned I = 0, N = Deduced.size(); I != N; ++I) { // FIXME: Variadic templates. Unwrap argument packs? NamedDecl *Param = FunctionTemplate->getTemplateParameters()->getParam(I); + if (!Deduced[I].isNull()) { if (I < NumExplicitlySpecified) { // We have already fully type-checked and converted this @@ -1777,6 +1778,15 @@ Sema::FinishTemplateArgumentDeduction(FunctionTemplateDecl *FunctionTemplate, continue; } + + // C++0x [temp.arg.explicit]p3: + // A trailing template parameter pack (14.5.3) not otherwise deduced will + // be deduced to an empty sequence of template arguments. + // FIXME: Where did the word "trailing" come from? + if (Param->isTemplateParameterPack()) { + Builder.push_back(TemplateArgument(0, 0)); + continue; + } // Substitute into the default template argument, if available. TemplateArgumentLoc DefArg |