From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Mon, 15 May 2006 09:40:30 +0000 (+0000)
Subject: re PR c++/27582 (ICE with invalid template parameter)
X-Git-Tag: releases/gcc-4.0.4~689
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac1dfe1e3ba86768076a6e6700e1aac548a4ba61;p=thirdparty%2Fgcc.git

re PR c++/27582 (ICE with invalid template parameter)

	PR c++/27582
	* pt.c (any_dependent_template_arguments_p): Return early on invalid
	argument list.

	* g++.dg/template/dependent-args1.C: New test.

From-SVN: r113786
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2773248686a7..5c07ea6916b3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2006-05-15  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+	PR c++/27582
+	* pt.c (any_dependent_template_arguments_p): Return early on invalid
+	argument list.
+
 	PR c++/27581
 	* search.c (adjust_result_of_qualified_name_lookup): Skip on
 	invalid context_class.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 26c63d81759b..0b7f2e67c6b5 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -12561,6 +12561,8 @@ any_dependent_template_arguments_p (tree args)
 
   if (!args)
     return false;
+  if (args == error_mark_node)
+    return true;
 
   for (i = 0; i < TMPL_ARGS_DEPTH (args); ++i)
     {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b720772ea5ac..5883d5525dbc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-15  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+	PR c++/27582
+	* g++.dg/template/dependent-args1.C: New test.
+
 	PR c++/27581
 	* g++.dg/lookup/this1.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/template/dependent-args1.C b/gcc/testsuite/g++.dg/template/dependent-args1.C
new file mode 100644
index 000000000000..0b197cf555e9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/dependent-args1.C
@@ -0,0 +1,11 @@
+// PR c++/27582
+// { dg-do compile }
+
+struct A
+{
+  template<int> void foo();
+};
+
+template<int N, void (A::*)() = &A::foo<N> > struct B {};
+
+B<int> b; // { dg-error "type/value mismatch|expected a constant|invalid type" }