diff options
| author | Marek Polacek <polacek@redhat.com> | 2018-02-26 14:12:25 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2018-02-26 14:12:25 +0000 |
| commit | 7518398dce1d913e01899d3aa52caec50e6efb4f (patch) | |
| tree | cfc620a06333d08deb813b0b790fba30887c1307 /gcc | |
| parent | bdb8ec2d8dfbfef3efaf63a3b51faeb651d63514 (diff) | |
| download | gcc-7518398dce1d913e01899d3aa52caec50e6efb4f.zip gcc-7518398dce1d913e01899d3aa52caec50e6efb4f.tar.gz gcc-7518398dce1d913e01899d3aa52caec50e6efb4f.tar.bz2 | |
re PR c++/84537 (ICE in get_string, at spellcheck-tree.h)
PR c++/84537
* name-lookup.c (suggest_alternative_in_explicit_scope): Return false
if name is error node.
* g++.dg/parse/error60.C: New test.
From-SVN: r257988
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/error60.C | 9 |
4 files changed, 24 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cb0dcd7..d824175 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-02-26 Marek Polacek <polacek@redhat.com> + + PR c++/84537 + * name-lookup.c (suggest_alternative_in_explicit_scope): Return false + if name is error node. + 2018-02-25 Jason Merrill <jason@redhat.com> PR c++/84015 - ICE with class deduction and auto template parm. diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 9117e0b..0f00328 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -5541,6 +5541,10 @@ bool suggest_alternative_in_explicit_scope (location_t location, tree name, tree scope) { + /* Something went very wrong; don't suggest anything. */ + if (name == error_mark_node) + return false; + /* Resolve any namespace aliases. */ scope = ORIGINAL_NAMESPACE (scope); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ba3101d..8c16b19 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-26 Marek Polacek <polacek@redhat.com> + + PR c++/84537 + * g++.dg/parse/error60.C: New test. + 2018-02-26 Jakub Jelinek <jakub@redhat.com> PR c++/84556 diff --git a/gcc/testsuite/g++.dg/parse/error60.C b/gcc/testsuite/g++.dg/parse/error60.C new file mode 100644 index 0000000..38f4e34 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/error60.C @@ -0,0 +1,9 @@ +// PR c++/84537 +// { dg-do compile } + +namespace N +{ + template<int> struct A {}; +} + +N::template A<> a; // { dg-error "" } |