From b95cc97b2023d00cd3fbae8455bc9d728eab5e5d Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Tue, 4 Jan 2011 02:33:52 +0000 Subject: [PATCH] When creating the injected-class-name for a class template involving a non-type template parameter pack, make sure to create a pack expansion for the corresponding template argument. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122799 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AST/DeclTemplate.cpp | 6 +++++- test/CXX/temp/temp.decls/temp.variadic/metafunctions.cpp | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/AST/DeclTemplate.cpp b/lib/AST/DeclTemplate.cpp index dff956c6dc..0110e3b180 100644 --- a/lib/AST/DeclTemplate.cpp +++ b/lib/AST/DeclTemplate.cpp @@ -14,6 +14,7 @@ #include "clang/AST/DeclCXX.h" #include "clang/AST/DeclTemplate.h" #include "clang/AST/Expr.h" +#include "clang/AST/ExprCXX.h" #include "clang/AST/ASTContext.h" #include "clang/AST/TypeLoc.h" #include "clang/AST/ASTMutationListener.h" @@ -327,7 +328,10 @@ ClassTemplateDecl::getInjectedClassNameSpecialization() { NTTP->getType().getNonLValueExprType(Context), Expr::getValueKindForType(NTTP->getType()), NTTP->getLocation()); - // FIXME: Variadic templates. + + if (NTTP->isParameterPack()) + E = new (Context) PackExpansionExpr(Context.DependentTy, E, + NTTP->getLocation()); Arg = TemplateArgument(E); } else { TemplateTemplateParmDecl *TTP = cast(*Param); diff --git a/test/CXX/temp/temp.decls/temp.variadic/metafunctions.cpp b/test/CXX/temp/temp.decls/temp.variadic/metafunctions.cpp index 69f6b46c28..47b7793da0 100644 --- a/test/CXX/temp/temp.decls/temp.variadic/metafunctions.cpp +++ b/test/CXX/temp/temp.decls/temp.variadic/metafunctions.cpp @@ -106,8 +106,6 @@ namespace Math { int check3[sum<1, 2, 3, 4, 5>::value == 15? 1 : -1]; -#if 0 - // FIXME: Instantiation of this fails. template struct lazy_sum { int operator()() { @@ -118,7 +116,6 @@ namespace Math { void f() { lazy_sum<1, 2, 3, 4, 5>()(); } -#endif } namespace Indices { -- 2.40.0