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

Only apply the parameter pack matching of C++0x [temp.arg.template]p3 

when we're actually matching a template template argument to a
template template parameter. Otherwise, use strict matching.

Fixes <rdar://problem/8859985> clang++: variadics and out-of-line definitions.

llvm-svn: 123385
This commit is contained in:
Douglas Gregor 2011-01-13 18:47:47 +00:00
parent 0e233ae183
commit 018778af3d
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3801,7 +3801,8 @@ Sema::TemplateParameterListsAreEqual(TemplateParameterList *New,
for (TemplateParameterList::iterator OldParm = Old->begin(),
OldParmEnd = Old->end();
OldParm != OldParmEnd; ++OldParm) {
if (!(*OldParm)->isTemplateParameterPack()) {
if (Kind != TPL_TemplateTemplateArgumentMatch ||
!(*OldParm)->isTemplateParameterPack()) {
if (NewParm == NewParmEnd) {
if (Complain)
DiagnoseTemplateParameterListArityMismatch(*this, New, Old, Kind,

16
clang/test/CXX/temp/temp.decls/temp.variadic/parameter-matching.cpp
View File

@ -25,3 +25,19 @@ template<int Values> struct X1nt; // expected-error{{non-type template parameter
template<template<class T> class> class X1tt; // expected-note{{previous template template parameter declared here}}
template<template<class T> class...> class X1tt; // expected-error{{template template parameter pack conflicts with previous template template parameter}}
// Check for matching with out-of-line definitions
namespace rdar8859985 {
template<typename ...> struct tuple { };
template<int ...> struct int_tuple { };
template<typename T>
struct X {
template<typename ...Args1, int ...Indices1>
X(tuple<Args1...>, int_tuple<Indices1...>);
};
template<typename T>
template<typename ...Args1, int ...Indices1>
X<T>::X(tuple<Args1...>, int_tuple<Indices1...>) {}
}