re PR c++/31431 (ICE with invalid parameter pack)

2007-05-25  Douglas Gregor <doug.gregor@gmail.com>

	PR c++/31431
	PR c++/31432
	PR c++/31434
	PR c++/31435
	PR c++/31437
	PR c++/31438
	PR c++/31442
	PR c++/31443
	PR c++/31444
	PR c++/31445
	* error.c (dump_type): Dump TYPE_ARGUMENT_PACK nodes.
	* cp-tree.h (check_for_bare_parameter_packs): Returns bool.
	* pt.c (check_for_bare_parameter_packs): Return bool indicated
	whether everything was okay. Fix indentation.
	(push_template_decl_real): Check for bare parameter packs in
	function parameters; where errors occur, mark the parameter types
	with ERROR_MARK_NODEs to avert ICEs.
	(coerce_template_parameter_pack): New.
	(coerce_template_parms): Moved parameter pack coercion into
	coerce_template_parameter_pack, and permit it anywhere in the
	template parameter list (not just at the end). Parameter and
	argument indices can vary (somewhat) separately now, so add
	PARM_IDX and ARG_IDX.
	(fn_type_unification): Don't set an argument pack as incomplete if
	no argument pack was deduced.
	(type_unification_real): If a type parameter is a parameter pack
	and has not otherwise been deduced, it will be deduced to an empty
	parameter pack.
	(more_specialized_fn): Use the actual lengths of the argument
	lists when comparing against expansions.
	* semantics.c (finish_member_declaration): If a field's type has
	bare parameter packs, error and set its type to ERROR_MARK_NODE.
	
2007-05-25  Douglas Gregor <doug.gregor@gmail.com>

	PR c++/31431
	PR c++/31432
	PR c++/31434
	PR c++/31435
	PR c++/31437
	PR c++/31438
	PR c++/31442
	PR c++/31443
	PR c++/31444
	PR c++/31445
	* g++.dg/cpp0x/pr31431.C: New.
	* g++.dg/cpp0x/pr31437.C: New.
	* g++.dg/cpp0x/pr31442.C: New.
	* g++.dg/cpp0x/pr31444.C: New.
	* g++.dg/cpp0x/pr31431-2.C: New.
	* g++.dg/cpp0x/pr31432.C: New.
	* g++.dg/cpp0x/pr31434.C: New.
	* g++.dg/cpp0x/pr31438.C: New.
	* g++.dg/cpp0x/pr31443.C: New.
	* g++.dg/cpp0x/pr31445.C: New.
	* g++.dg/cpp0x/variadic-crash1.C: New.

From-SVN: r125062

gcc/cp/ChangeLog

+2007-05-25  Douglas Gregor <doug.gregor@gmail.com>
+
+	PR c++/31431
+	PR c++/31432
+	PR c++/31434
+	PR c++/31435
+	PR c++/31437
+	PR c++/31438
+	PR c++/31442
+	PR c++/31443
+	PR c++/31444
+	PR c++/31445
+	* error.c (dump_type): Dump TYPE_ARGUMENT_PACK nodes.
+	* cp-tree.h (check_for_bare_parameter_packs): Returns bool.
+	* pt.c (check_for_bare_parameter_packs): Return bool indicated
+	whether everything was okay. Fix indentation.
+	(push_template_decl_real): Check for bare parameter packs in
+	function parameters; where errors occur, mark the parameter types
+	with ERROR_MARK_NODEs to avert ICEs.
+	(coerce_template_parameter_pack): New.
+	(coerce_template_parms): Moved parameter pack coercion into
+	coerce_template_parameter_pack, and permit it anywhere in the
+	template parameter list (not just at the end). Parameter and
+	argument indices can vary (somewhat) separately now, so add
+	PARM_IDX and ARG_IDX.
+	(fn_type_unification): Don't set an argument pack as incomplete if
+	no argument pack was deduced.
+	(type_unification_real): If a type parameter is a parameter pack
+	and has not otherwise been deduced, it will be deduced to an empty
+	parameter pack.
+	(more_specialized_fn): Use the actual lengths of the argument
+	lists when comparing against expansions.
+	* semantics.c (finish_member_declaration): If a field's type has
+	bare parameter packs, error and set its type to ERROR_MARK_NODE.
+
 2007-05-24  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	PR target/27067

gcc/cp/cp-tree.h

@@ -4393,7 +4393,7 @@ extern bool uses_parameter_packs                (tree);
 extern bool template_parameter_pack_p           (tree);
 extern bool template_parms_variadic_p           (tree);
 extern tree make_pack_expansion                 (tree);
-extern void check_for_bare_parameter_packs      (tree);
+extern bool check_for_bare_parameter_packs      (tree);
 extern int template_class_depth			(tree);
 extern int is_specialization_of			(tree, tree);
 extern bool is_specialization_of_friend		(tree, tree);

gcc/cp/error.c

@@ -395,6 +395,19 @@ dump_type (tree t, int flags)
       pp_cxx_identifier (cxx_pp, "...");
       break;
 
+    case TYPE_ARGUMENT_PACK:
+      {
+        tree args = ARGUMENT_PACK_ARGS (t);
+        int i;
+        for (i = 0; i < TREE_VEC_LENGTH (args); ++i)
+          {
+            if (i)
+              pp_separate_with_comma (cxx_pp);
+            dump_type (TREE_VEC_ELT (args, i), flags);
+          }
+      }
+      break;
+
     default:
       pp_unsupported_tree (cxx_pp, t);
       /* Fall through to error.  */

gcc/cp/semantics.c

@@ -2283,6 +2283,11 @@ finish_member_declaration (tree decl)
   /* Mark the DECL as a member of the current class.  */
   DECL_CONTEXT (decl) = current_class_type;
 
+  /* Check for bare parameter packs in the member variable declaration.  */
+  if (TREE_CODE (decl) == FIELD_DECL
+      && !check_for_bare_parameter_packs (TREE_TYPE (decl)))
+    TREE_TYPE (decl) == error_mark_node;
+
   /* [dcl.link]
 
      A C language linkage is ignored for the names of class members

gcc/testsuite/ChangeLog

+2007-05-25  Douglas Gregor <doug.gregor@gmail.com>
+
+	PR c++/31431
+	PR c++/31432
+	PR c++/31434
+	PR c++/31435
+	PR c++/31437
+	PR c++/31438
+	PR c++/31442
+	PR c++/31443
+	PR c++/31444
+	PR c++/31445
+	* g++.dg/cpp0x/pr31431.C: New.
+	* g++.dg/cpp0x/pr31437.C: New.
+	* g++.dg/cpp0x/pr31442.C: New.
+	* g++.dg/cpp0x/pr31444.C: New.
+	* g++.dg/cpp0x/pr31431-2.C: New.
+	* g++.dg/cpp0x/pr31432.C: New.
+	* g++.dg/cpp0x/pr31434.C: New.
+	* g++.dg/cpp0x/pr31438.C: New.
+	* g++.dg/cpp0x/pr31443.C: New.
+	* g++.dg/cpp0x/pr31445.C: New.
+	* g++.dg/cpp0x/variadic-crash1.C: New.
+
 2007-05-25  Richard Sandiford  <richard@codesourcery.com>
 
 	* gcc.target/arm/long-calls-1.c: New test.

gcc/testsuite/g++.dg/cpp0x/pr31431-2.C

+// { dg-options "-std=gnu++0x" }
+template<typename, typename..., typename> void foo();
+
+void bar()
+{
+  foo<int>(); // { dg-error "no matching function" }
+}

gcc/testsuite/g++.dg/cpp0x/pr31431.C

+// { dg-options "-std=gnu++0x" }
+template<typename..., typename> void foo();
+
+void bar()
+{
+  foo<int>(); // { dg-error "no matching function" }
+}

gcc/testsuite/g++.dg/cpp0x/pr31432.C

+// { dg-options "-std=gnu++0x" }
+template<typename..., typename> struct A // { dg-error "parameter pack" }
+{
+ static int i;
+};
+
+A<int, int> a; // { dg-error "invalid type" }
+A<char,int> b; // { dg-error "invalid type" }

gcc/testsuite/g++.dg/cpp0x/pr31434.C

+// { dg-options "-std=gnu++0x" }
+template<typename... T> int foo(const T&) // { dg-error "not expanded with|T" }
+{
+ union { T t; }; // { dg-error "not expanded with|T" }
+ return t;
+}
+
+void bar()
+{
+  foo(0); // { dg-error "no matching" }
+}

gcc/testsuite/g++.dg/cpp0x/pr31437.C

+// { dg-options "-std=gnu++0x" }
+template <typename... T> struct A
+{ // { dg-error "candidates|A" }
+  A(T* p) {  // { dg-error "parameter packs|T" }
+   (A<T...>*)(p); 
+  }
+};
+
+A<int> a(0); // { dg-error "no matching" }

gcc/testsuite/g++.dg/cpp0x/pr31438.C

+// { dg-options "-std=gnu++0x" }
+
+template<typename> struct A; // { dg-error "candidates" }
+template<typename T, typename... U> struct A<T(U)> // { dg-error "parameter packs|U" }
+{ // { dg-error "parameter packs|U" }
+ template<typename X> A(X); // { dg-error "parameter packs|U" }
+};
+
+A<void(int)> a(0); // { dg-error "no matching" }

gcc/testsuite/g++.dg/cpp0x/pr31442.C

+// { dg-options "-std=gnu++0x" }
+template<typename... T, T = 0> struct A {}; // { dg-error "parameter packs|T|the end" }
+
+struct B
+{
+  template <template <typename...> class C> B(C<int>);
+};
+
+B b = A<int>();

gcc/testsuite/g++.dg/cpp0x/pr31443.C

+// { dg-options "-std=gnu++0x" }
+
+template<int, typename... T> struct A
+{
+  template<int N> void foo(A<N,T>); // { dg-error "parameter packs|T" }
+};
+
+void bar()
+{
+  A<0,int>().foo(A<0,int>()); // { dg-error "no member named" }
+}

gcc/testsuite/g++.dg/cpp0x/pr31444.C

+// { dg-options "-std=gnu++0x" }
+template<typename... T> struct A
+{
+  template<int> void foo(A<T>); // { dg-error "not expanded|T" }
+};
+
+void bar()
+{
+  A<int>().foo<0>(A<int>()); // { dg-error "no member named" }
+};

gcc/testsuite/g++.dg/cpp0x/pr31445.C

+// { dg-options "-std=gnu++0x" }
+template <typename... T> struct A
+{
+  void foo(T...); // { dg-error "candidates" }
+  A(T... t) { foo(t); } // { dg-error "parameter packs|t|no matching" }
+};
+
+A<int> a(0);

gcc/testsuite/g++.dg/cpp0x/variadic-crash1.C

+// { dg-options "-std=gnu++0x" }
+
+#define ONE
+#define TWO
+#define THREE
+
+struct Something {};
+Something ___;
+
+template <class F>
+struct Trial
+{
+ F f;
+public:
+ Trial() : f() {}
+ Trial( const F& ff ) : f(ff) { }
+ template <typename... Args>
+ struct Sig { typedef int ResultType; };
+
+ template <typename... Args>
+ struct Sig<Something,Args...> { typedef int ResultType;  };
+
+#ifdef ONE
+
+template <typename... Args>
+typename Sig<Something,Args...>::ResultType operator()(const Something& s, const Args&... args) const
+{
+ return f(args...);
+}
+#endif
+#ifdef TWO
+template <typename... Args>
+typename Sig<Args...>::ResultType operator()(const Args&... args) const
+{
+ return f(args...);
+}
+#endif
+};
+
+struct Internal
+{
+
+template <typename... Args>
+struct Sig { typedef int ResultType; };
+
+template <typename... Args>
+struct Sig<Something,Args...> { typedef int ResultType;  };
+
+template <typename... Args>
+int operator()(const Args&... args) const
+{
+ int n = sizeof...(Args);
+ return n;
+}
+
+ static Trial<Internal>& full() { static Trial<Internal> f; return f; }
+};
+
+static Trial<Internal>& internal = Internal::full();
+
+int main()
+{
+ int n = 0;
+#ifdef ONE
+ n = internal(___,1,2);
+#endif
+#ifdef THREE
+ n = internal(___,1,2,3);
+ n = internal(___,1,2,3,4);
+#endif
+ return 0;
+}