diff options
| author | Dodji Seketeli <dodji@redhat.com> | 2011-12-19 09:47:46 +0000 |
|---|---|---|
| committer | Dodji Seketeli <dodji@gcc.gnu.org> | 2011-12-19 10:47:46 +0100 |
| commit | 7063212f9a3b6db6ae912451963cc184ceff94ea (patch) | |
| tree | 5e2a7c47def5178095642d1ba43b9feecc07a2c6 /gcc/cp | |
| parent | fac665b24a55893660c3c7e60fb92037181e8f0c (diff) | |
| download | gcc-7063212f9a3b6db6ae912451963cc184ceff94ea.zip gcc-7063212f9a3b6db6ae912451963cc184ceff94ea.tar.gz gcc-7063212f9a3b6db6ae912451963cc184ceff94ea.tar.bz2 | |
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
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/search.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6f1bc26..640bf9a 100644 --- 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 3894c68..0ceb5bc 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); |