From 7063212f9a3b6db6ae912451963cc184ceff94ea Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Mon, 19 Dec 2011 09:47:46 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/search.c | 4 +++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/nsdmi6.C | 8 ++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/nsdmi6.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6f1bc26c9a9..640bf9a9092 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-12-19 Dodji Seketeli + + PR c++/51477 + * search.c (lookup_member): Get out early on invalid base type. + 2011-12-19 Jason Merrill PR c++/51489 diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 3894c685884..0ceb5bc14f8 100644 --- 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 936ef1ae233..a8c71f2d0a9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-12-19 Dodji Seketeli + + PR c++/51477 + * g++.dg/cpp0x/nsdmi6.C: New test. + 2011-12-19 Tobias Burnus * 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 index 00000000000..bb455e778e4 --- /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" } +}; -- 2.30.2