From 66bd30863fe5673f902fa64a1af0a47f4911fdd2 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 27 Apr 2018 18:39:18 +0000 Subject: [PATCH] Don't offer suggestions for compiler-generated variables (PR c++/85515) gcc/cp/ChangeLog: PR c++/85515 * name-lookup.c (consider_binding_level): Skip compiler-generated variables. * search.c (lookup_field_fuzzy_info::fuzzy_lookup_field): Flatten nested if statements into a series of rejection tests. Reject lambda-ignored entities as suggestions. gcc/testsuite/ChangeLog: PR c++/85515 * g++.dg/pr85515-1.C: New test. * g++.dg/pr85515-2.C: New test. From-SVN: r259720 --- gcc/cp/ChangeLog | 9 +++++++++ gcc/cp/name-lookup.c | 6 ++++++ gcc/cp/search.c | 13 ++++++++++--- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/pr85515-1.C | 18 ++++++++++++++++++ gcc/testsuite/g++.dg/pr85515-2.C | 22 ++++++++++++++++++++++ 6 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/pr85515-1.C create mode 100644 gcc/testsuite/g++.dg/pr85515-2.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2dbc67501c5..d8e7089af85 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2018-04-27 David Malcolm + + PR c++/85515 + * name-lookup.c (consider_binding_level): Skip compiler-generated + variables. + * search.c (lookup_field_fuzzy_info::fuzzy_lookup_field): Flatten + nested if statements into a series of rejection tests. Reject + lambda-ignored entities as suggestions. + 2018-04-27 Jason Merrill * cvt.c (cp_fold_convert): Use convert_ptrmem. diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index c1f7cf5817b..2af2462825c 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -5860,6 +5860,12 @@ consider_binding_level (tree name, best_match &bm, && DECL_ANTICIPATED (d)) continue; + /* Skip compiler-generated variables (e.g. __for_begin/__for_end + within range for). */ + if (TREE_CODE (d) == VAR_DECL + && DECL_ARTIFICIAL (d)) + continue; + tree suggestion = DECL_NAME (d); if (!suggestion) continue; diff --git a/gcc/cp/search.c b/gcc/cp/search.c index bfeaf2cc819..22c0492f535 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -1224,9 +1224,16 @@ lookup_field_fuzzy_info::fuzzy_lookup_field (tree type) for (tree field = TYPE_FIELDS (type); field; field = DECL_CHAIN (field)) { - if (!m_want_type_p || DECL_DECLARES_TYPE_P (field)) - if (DECL_NAME (field)) - m_candidates.safe_push (DECL_NAME (field)); + if (m_want_type_p && !DECL_DECLARES_TYPE_P (field)) + continue; + + if (!DECL_NAME (field)) + continue; + + if (is_lambda_ignored_entity (field)) + continue; + + m_candidates.safe_push (DECL_NAME (field)); } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a20bfd0c1dc..ce5eabadb57 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-04-27 David Malcolm + + PR c++/85515 + * g++.dg/pr85515-1.C: New test. + * g++.dg/pr85515-2.C: New test. + 2018-04-27 Paolo Carlini PR c++/84691 diff --git a/gcc/testsuite/g++.dg/pr85515-1.C b/gcc/testsuite/g++.dg/pr85515-1.C new file mode 100644 index 00000000000..0e27a9de6d9 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr85515-1.C @@ -0,0 +1,18 @@ +// { dg-require-effective-target c++14 } + +void test_1 () +{ + auto lambda = [val = 2](){}; + lambda.val; // { dg-bogus "did you mean" } + // { dg-error "has no member named 'val'" "" { target *-*-* } .-1 } +} + +int test_2 () +{ + auto lambda = [val = 2](){ return val; }; + + // TODO: should we issue an error for the following assignment? + lambda.__val = 4; + + return lambda(); +} diff --git a/gcc/testsuite/g++.dg/pr85515-2.C b/gcc/testsuite/g++.dg/pr85515-2.C new file mode 100644 index 00000000000..621ddb87636 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr85515-2.C @@ -0,0 +1,22 @@ +// { dg-require-effective-target c++11 } + +void test_1 () +{ + int arr[] = {1, 2, 3, 4, 5}; + for (const auto v: arr) { + _forbegin; // { dg-bogus "suggested alternative" } + // { dg-error "'_forbegin' was not declared in this scope" "" { target *-*-*} .-1 } + } +} + +int test_2 () +{ + int arr[] = {1, 2, 3, 4, 5}; + int sum = 0; + for (const auto v: arr) { + sum += v; + // TODO: should we issue an error for the following assignment? + __for_begin = __for_end; + } + return sum; +} -- 2.30.2