From a1e03bc5bc4983bb0cda698575b45a2be16765a4 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Sat, 16 Mar 2013 22:34:31 -0400
Subject: re PR c++/55241 ([C++11] diagnostics show sizeof...(T) as
 sizeof(T...))

	PR c++/55241
	* error.c (dump_expr) [SIZEOF_EXPR]: Print sizeof... properly.

From-SVN: r196726
---
 gcc/cp/ChangeLog                            |  3 +++
 gcc/cp/error.c                              | 14 +++++++++++---
 gcc/testsuite/g++.dg/diagnostic/variadic1.C |  9 +++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/diagnostic/variadic1.C

(limited to 'gcc')

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 14bab43..5b27820 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2013-03-16  Jason Merrill  <jason@redhat.com>
 
+	PR c++/55241
+	* error.c (dump_expr) [SIZEOF_EXPR]: Print sizeof... properly.
+
 	* parser.c (lookup_literal_operator): Correct parm/arg naming
 	mixup.
 
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index c2bf54d..c3dce1d 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1783,6 +1783,8 @@ resolve_virtual_fun_from_obj_type_ref (tree ref)
 static void
 dump_expr (tree t, int flags)
 {
+  tree op;
+
   if (t == 0)
     return;
 
@@ -2316,14 +2318,20 @@ dump_expr (tree t, int flags)
 	  gcc_assert (TREE_CODE (t) == ALIGNOF_EXPR);
 	  pp_cxx_ws_string (cxx_pp, "__alignof__");
 	}
+      op = TREE_OPERAND (t, 0);
+      if (PACK_EXPANSION_P (op))
+	{
+	  pp_string (cxx_pp, "...");
+	  op = PACK_EXPANSION_PATTERN (op);
+	}
       pp_cxx_whitespace (cxx_pp);
       pp_cxx_left_paren (cxx_pp);
       if (TREE_CODE (t) == SIZEOF_EXPR && SIZEOF_EXPR_TYPE_P (t))
-	dump_type (TREE_TYPE (TREE_OPERAND (t, 0)), flags);
+	dump_type (TREE_TYPE (op), flags);
       else if (TYPE_P (TREE_OPERAND (t, 0)))
-	dump_type (TREE_OPERAND (t, 0), flags);
+	dump_type (op, flags);
       else
-	dump_expr (TREE_OPERAND (t, 0), flags);
+	dump_expr (op, flags);
       pp_cxx_right_paren (cxx_pp);
       break;
 
diff --git a/gcc/testsuite/g++.dg/diagnostic/variadic1.C b/gcc/testsuite/g++.dg/diagnostic/variadic1.C
new file mode 100644
index 0000000..69f1f98
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/variadic1.C
@@ -0,0 +1,9 @@
+// PR c++/55241
+// { dg-do compile { target c++11 } }
+
+template<int N> struct B { };
+template<typename... T> struct A
+{
+  B<sizeof...(T)> f();		// { dg-error "sizeof\\.\\.\\." }
+  B<42> f();			// { dg-error "cannot be overloaded" }
+};
-- 
cgit v1.1