diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2018-06-27 23:21:46 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2018-06-27 23:21:46 +0000 |
| commit | 5da1234bb7aaf95dd7e3b5e5438cd92be95daf0f (patch) | |
| tree | 12eafa9bd3a739d78c5cd45154533aa9946be2cd /gcc | |
| parent | b4324a144b4499725143baf1f69722f92814572e (diff) | |
| download | gcc-5da1234bb7aaf95dd7e3b5e5438cd92be95daf0f.zip gcc-5da1234bb7aaf95dd7e3b5e5438cd92be95daf0f.tar.gz gcc-5da1234bb7aaf95dd7e3b5e5438cd92be95daf0f.tar.bz2 | |
C++: don't offer bogus "._0" suggestions (PR c++/86329)
PR c++/86329 reports that the C++ frontend can offer bogus suggestions like:
#include <string>
int compare()
{
return __n1 - __n2;
}
suggested.cc: In function 'int compare()':
suggested.cc:5:10: error: '__n1' was not declared in this scope
return __n1 - __n2;
^~~~
suggested.cc:5:10: note: suggested alternative: '._61'
return __n1 - __n2;
^~~~
._61
suggested.cc:5:17: error: '__n2' was not declared in this scope
return __n1 - __n2;
^~~~
suggested.cc:5:17: note: suggested alternative: '._72'
return __n1 - __n2;
^~~~
._72
The dot-prefixed names are an implementation detail of how we implement
anonymous enums found in the header files, generated via
anon_aggrname_format in make_anon_name.
This patch uses anon_aggrname_p to filter them out when considering
which names to suggest.
gcc/cp/ChangeLog:
PR c++/86329
* name-lookup.c (consider_binding_level): Filter out names that
match anon_aggrname_p.
gcc/testsuite/ChangeLog:
PR c++/86329
* g++.dg/lookup/pr86329.C: New test.
From-SVN: r262199
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lookup/pr86329.C | 11 |
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 05383b6..040a84d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-06-27 David Malcolm <dmalcolm@redhat.com> + + PR c++/86329 + * name-lookup.c (consider_binding_level): Filter out names that + match anon_aggrname_p. + 2018-06-27 Jason Merrill <jason@redhat.com> * name-lookup.c (do_pushtag): If we skip a class level, also skip diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index e0500d8..3aafb0f 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -5786,6 +5786,11 @@ consider_binding_level (tree name, best_match <tree, const char *> &bm, if (!suggestion) continue; + /* Don't suggest names that are for anonymous aggregate types, as + they are an implementation detail generated by the compiler. */ + if (anon_aggrname_p (suggestion)) + continue; + const char *suggestion_str = IDENTIFIER_POINTER (suggestion); /* Ignore internal names with spaces in them. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e9e2e2a..3b33d20 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-06-27 David Malcolm <dmalcolm@redhat.com> + + PR c++/86329 + * g++.dg/lookup/pr86329.C: New test. + 2018-06-27 Carl Love <cel@us.ibm.com> Add test case that was supposed to be added in commit 255556 on 2017-12-11. diff --git a/gcc/testsuite/g++.dg/lookup/pr86329.C b/gcc/testsuite/g++.dg/lookup/pr86329.C new file mode 100644 index 0000000..fc091ba --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/pr86329.C @@ -0,0 +1,11 @@ +/* PR c++/86329: ensure we don't erroneously offer suggestions like "._0", + which are an implementation detail of how e.g. anonymous enums are + handled internally. */ + +enum {NONEMPTY}; + +int test() +{ + return __0; // { dg-error "'__0' was not declared in this scope" } + // { dg-bogus "suggested alternative" "" { target *-*-* } .-1 } +} |