Fix pack instantiation with function types.

Make sure we correctly expand packs which expand to another
pack in a function type.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@186728 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h
index 34fdbad87b3401a5648a83202b1aeb3193207aa3..4a41b603642851db494164abf80f9da3670784a3 100644 (file)
--- a/lib/Sema/TreeTransform.h
+++ b/lib/Sema/TreeTransform.h
@@ -4269,6 +4269,10 @@ bool TreeTransform<Derived>::
           if (NewType.isNull())
             return true;
 
+          if (NewType->containsUnexpandedParameterPack())
+            NewType = getSema().Context.getPackExpansionType(NewType,
+                                                             NumExpansions);
+
           OutParamTypes.push_back(NewType);
           if (PVars)
             PVars->push_back(0);

diff --git a/test/SemaTemplate/alias-templates.cpp b/test/SemaTemplate/alias-templates.cpp
index eeb6b95189769264b5021bd48baf11640b4d1728..f495620b54fbaa1ebbf71a951ca4d07c2aaf98ec 100644 (file)
--- a/test/SemaTemplate/alias-templates.cpp
+++ b/test/SemaTemplate/alias-templates.cpp
@@ -189,3 +189,10 @@ namespace PR16646 {
     }
   }
 }
+
+namespace VariadicAliasWithFunctionType {
+  template <class T> struct A { };
+  template <class ...Args> using B = A<int(Args ...x)>;
+  template <class ...Args> void f(B<A<int>, A<Args>...>) {}
+  void g() { f(A<int(A<int>,A<int>)>()); }
+}