PR c++/51477 - ICE with invalid NSDMI

gcc/cp/

	PR c++/51477
	* search.c (lookup_member): Get out early on invalid base type.

gcc/testsuite/

	PR c++/51477
	* g++.dg/cpp0x/nsdmi6.C: New test.

From-SVN: r182474

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6f1bc26c9a91614274fb86200b4f248219cca2c5..640bf9a909225255d98cc02c647b8e80871995f4 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-19  Dodji Seketeli  <dodji@redhat.com>
+
+       PR c++/51477
+       * search.c (lookup_member): Get out early on invalid base type.
+
 2011-12-19  Jason Merrill  <jason@redhat.com>
 
        PR c++/51489

diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 3894c6858842a37369db94906b6079f9e15a3994..0ceb5bc14f8d16abc0d3f820a047619cfeb305bf 100644 (file)
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -1171,7 +1171,9 @@ lookup_member (tree xbasetype, tree name, int protect, bool want_type,
 
   const char *errstr = 0;
 
-  if (name == error_mark_node)
+  if (name == error_mark_node
+      || xbasetype == NULL_TREE
+      || xbasetype == error_mark_node)
     return NULL_TREE;
 
   gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 936ef1ae23347674af96525b7a25ba7e53d526e9..a8c71f2d0a974323dd2f39e72e23625af320ae03 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-19  Dodji Seketeli  <dodji@redhat.com>
+
+       PR c++/51477
+       * g++.dg/cpp0x/nsdmi6.C: New test.
+
 2011-12-19  Tobias Burnus  <burnus@net-b.de>
 
        * gfortran.dg/coarray_poly_3.f90: New.

diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi6.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi6.C
new file mode 100644 (file)
index 0000000..bb455e7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi6.C
@@ -0,0 +1,8 @@
+// Origin PR c++/51477
+// { dg-options "-std=c++11" }
+
+struct A
+{
+    typedef int int T; // { dg-error "two or more data types in declaration" }
+    struct T x[1] = { 0 }; // { dg-error "invalid|forward" }
+};