From f905751487709b5ef6cde81c5440c4528e7f4390 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Sun, 15 Apr 2012 23:18:06 -0400
Subject: [PATCH] re PR c++/52292 ([C++11] Variadic template expansion into
 fixed template causes constructor to not match)

	PR c++/52292
	PR c++/52380
	* pt.c (coerce_template_parms): Even if we aren't converting we
	want to expand argument packs.

From-SVN: r186479
---
 gcc/cp/ChangeLog                         |  5 ++++
 gcc/cp/pt.c                              |  2 +-
 gcc/testsuite/ChangeLog                  |  6 +++++
 gcc/testsuite/g++.dg/cpp0x/variadic124.C | 29 ++++++++++++++++++++++++
 gcc/testsuite/g++.dg/cpp0x/variadic125.C | 25 ++++++++++++++++++++
 5 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic124.C
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic125.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 69d5b1d3428..d37d42c0264 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2012-04-15  Jason Merrill  <jason@redhat.com>
 
+	PR c++/52292
+	PR c++/52380
+	* pt.c (coerce_template_parms): Even if we aren't converting we
+	want to expand argument packs.
+
 	PR c++/52706
 	* mangle.c (write_type): nullptr_t is a builtin type.
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 07a2cc00bb2..42dc0a74439 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6882,7 +6882,7 @@ coerce_template_parms (tree parms,
             {
               /* We don't know how many args we have yet, just
                  use the unconverted ones for now.  */
-              new_inner_args = args;
+              new_inner_args = inner_args;
               break;
             }
         }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f3f68951bf4..a936b368ce0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2012-04-15  Jason Merrill  <jason@redhat.com>
 
+	PR c++/52380
+	* g++.dg/cpp0x/variadic125.C: New.
+
+	PR c++/52292
+	* g++.dg/cpp0x/variadic124.C: New.
+
 	PR c++/52706
 	* g++.dg/cpp0x/nullptr27.C: New.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic124.C b/gcc/testsuite/g++.dg/cpp0x/variadic124.C
new file mode 100644
index 00000000000..8ddc810b313
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic124.C
@@ -0,0 +1,29 @@
+// PR c++/52292
+// { dg-options -std=c++11 }
+
+template <template <typename...> class T>
+struct foo {
+    template <typename... U>
+    foo(T<U...> x) { }
+};
+
+template <typename T>
+struct bar {
+    bar(T x) : value(x) { }
+
+    T value;
+};
+
+struct generic : private foo<bar> {
+    template <typename T>
+    generic(bar<T> x) : foo(x)
+    {
+    }
+
+};
+
+int main()
+{
+    bar<int> x(32);
+    generic y(x); // FAILS
+}
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic125.C b/gcc/testsuite/g++.dg/cpp0x/variadic125.C
new file mode 100644
index 00000000000..89fd6b00d14
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic125.C
@@ -0,0 +1,25 @@
+// PR c++/52380
+// { dg-do compile { target c++11 } }
+
+template<typename T>
+struct S
+{
+  template<typename U>
+  struct Unary                        // Line 5
+  {};
+
+  template<unsigned, typename... Args>
+  struct Dispatch                     // Line 9
+    : public Unary<Args...>
+  {};
+
+  template<typename... Args>
+  struct Variadic
+    : public Dispatch<sizeof...(Args), Args...>
+  {};
+};
+
+int main()
+{
+  S<void>::Variadic<void> z;
+}
-- 
2.30.2