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: r127965

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3285436a6fcf2f161a01ad1447e9cb54d6a4ba15..02af49f8d39be07b1ad14866d1307fa95fabf73e 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-24  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/31941

diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 0cfd51394524df50f8a711c7300446bc4d9ff3b8..259ec66205f5d805ff1c2858edd52726480e5fa1 100644 (file)
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -1200,6 +1200,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 a4cbd9728b6a55eae52dc7acfafeaa5c42bec4f0..97e73bd22d992ae97845f5d13d74319c9403b391 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-24  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/32912

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" }