From d4300cc6eae1503d95eb70865f8a82adab7e552d Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 21 Nov 2017 21:59:53 +0000 Subject: [PATCH] C: don't suggest names that came from earlier failures (PR c/83056) PR c/83056 reports an issue affecting trunk and gcc-7 in which the C frontend's implementation of lookup_name_fuzzy uses undeclared identifiers as suggestions when encountering subsequent undeclared identifiers. The fix is to filter out the names bound to error_mark_node in lookup_name_fuzzy. The C++ frontend is unaffected, as it already does this. gcc/c/ChangeLog: PR c/83056 * c-decl.c (lookup_name_fuzzy): Don't suggest names that came from earlier failed lookups. gcc/testsuite/ChangeLog: PR c/83056 * gcc.dg/spellcheck-pr83056.c: New test case. From-SVN: r255038 --- gcc/c/ChangeLog | 6 ++++++ gcc/c/c-decl.c | 2 ++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/spellcheck-pr83056.c | 11 +++++++++++ 4 files changed, 24 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/spellcheck-pr83056.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index a2773b0956f..a4dc563bb75 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2017-11-21 David Malcolm + + PR c/83056 + * c-decl.c (lookup_name_fuzzy): Don't suggest names that came from + earlier failed lookups. + 2017-11-21 Marc Glisse * c-fold.c (c_fully_fold_internal): Handle POINTER_DIFF_EXPR. diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index e0a4dd1661a..9c3beab0a8d 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -4035,6 +4035,8 @@ lookup_name_fuzzy (tree name, enum lookup_name_fuzzy_kind kind, location_t loc) { if (!binding->id || binding->invisible) continue; + if (binding->decl == error_mark_node) + continue; /* Don't use bindings from implicitly declared functions, as they were likely misspellings themselves. */ if (TREE_CODE (binding->decl) == FUNCTION_DECL) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0d86a868534..b3e371e6e31 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-11-21 David Malcolm + + PR c/83056 + * gcc.dg/spellcheck-pr83056.c: New test case. + 2017-11-21 Martin Sebor PR tree-optimization/82945 diff --git a/gcc/testsuite/gcc.dg/spellcheck-pr83056.c b/gcc/testsuite/gcc.dg/spellcheck-pr83056.c new file mode 100644 index 00000000000..8b90887bda0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/spellcheck-pr83056.c @@ -0,0 +1,11 @@ +enum { TYPE_A }; + +/* Verify that the incorrect "TYPE_B" etc don't get re-used for + suggestions for the later incorrect values. */ + +void pr83056(void) +{ + int b = TYPE_B; /* { dg-error "did you mean 'TYPE_A'" } */ + int c = TYPE_C; /* { dg-error "did you mean 'TYPE_A'" } */ + int d = TYPE_D; /* { dg-error "did you mean 'TYPE_A'" } */ +} -- 2.30.2