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

/cp
2007-08-31  Paolo Carlini  <pcarlini@suse.de>

	PR c++/32113
	* search.c (lookup_member): Check the name argument for
	error_mark_node.

/testsuite
2007-08-31  Paolo Carlini  <pcarlini@suse.de>

	PR c++/32113
	* g++.dg/template/crash70.C: New.

From-SVN: r127966

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 53e4b0fb633d83f15b9b622c02c2d9c2dbf9212f..07591343d51767859e134ca4c83721d147b744f3 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-31  Paolo Carlini  <pcarlini@suse.de>
+
+       PR c++/32113
+       * search.c (lookup_member): Check the name argument for
+       error_mark_node.
+
 2007-08-29  Nick Clifton  <nickc@redhat.com>
 
        * typeck.c: Change copyright header to refer to version 3 of the

diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index d5c57a9e546198e20987c7d892eb68252d604097..4371eb4358ed6cfa4de8f6d72a4bc5dea4f0a5e3 100644 (file)
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -1199,6 +1199,9 @@ lookup_member (tree xbasetype, tree name, int protect, bool want_type)
 
   const char *errstr = 0;
 
+  if (name == error_mark_node)
+    return NULL_TREE;
+
   gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE);
 
   if (TREE_CODE (xbasetype) == TREE_BINFO)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 46d0dfcfa4b17a213bf4c08f7d4a38ba2fd4dbf8..f24c8cf96002999b7575d078726ff4019da70d23 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-31  Paolo Carlini  <pcarlini@suse.de>
+
+       PR c++/32113
+       * g++.dg/template/crash70.C: New.
+
 2007-08-31  Nick Clifton  <nickc@redhat.com>
 
        * gcc.c-torture/execute/execute.exp: Change copyright header to

diff --git a/gcc/testsuite/g++.dg/template/crash70.C b/gcc/testsuite/g++.dg/template/crash70.C
new file mode 100644 (file)
index 0000000..742f77b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash70.C
@@ -0,0 +1,7 @@
+// PR c++/32113
+
+template<int> struct A;
+
+template<typename T> void foo (A<&T::template i>); // { dg-error "not a template" }
+
+template void foo<A<0> > (A<0>); // { dg-error "does not match" }