aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2022-03-08 21:41:21 +0100
committerJakub Jelinek <jakub@redhat.com>2022-03-08 21:41:21 +0100
commite480c3c06d20874fd7504bfdcca0b829f8000389 (patch)
tree9de43b7c278f7c19d2b293d5a53e02e877d9012b
parent768956c0d115766fe7e1168d420310182ae48d9f (diff)
downloadgcc-e480c3c06d20874fd7504bfdcca0b829f8000389.zip
gcc-e480c3c06d20874fd7504bfdcca0b829f8000389.tar.gz
gcc-e480c3c06d20874fd7504bfdcca0b829f8000389.tar.bz2
c++: Don't suggest cdtor or conversion op identifiers in spelling hints [PR104806]
On the following testcase, we emit "did you mean '__dt '?" in the error message. "__dt " shows there because it is dtor_identifier, but we shouldn't suggest those to the user, they are purely internal and can't be really typed by the user because of the final space in it. 2022-03-08 Jakub Jelinek <jakub@redhat.com> PR c++/104806 * search.cc (lookup_field_fuzzy_info::fuzzy_lookup_field): Ignore identifiers with space at the end. * g++.dg/spellcheck-pr104806.C: New test.
-rw-r--r--gcc/cp/search.cc7
-rw-r--r--gcc/testsuite/g++.dg/spellcheck-pr104806.C5
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/cp/search.cc b/gcc/cp/search.cc
index 00c669e..2b82104 100644
--- a/gcc/cp/search.cc
+++ b/gcc/cp/search.cc
@@ -1275,6 +1275,13 @@ lookup_field_fuzzy_info::fuzzy_lookup_field (tree type)
if (is_lambda_ignored_entity (field))
continue;
+ /* Ignore special identifiers with space at the end like cdtor or
+ conversion op identifiers. */
+ if (TREE_CODE (DECL_NAME (field)) == IDENTIFIER_NODE)
+ if (unsigned int len = IDENTIFIER_LENGTH (DECL_NAME (field)))
+ if (IDENTIFIER_POINTER (DECL_NAME (field))[len - 1] == ' ')
+ continue;
+
m_candidates.safe_push (DECL_NAME (field));
}
}
diff --git a/gcc/testsuite/g++.dg/spellcheck-pr104806.C b/gcc/testsuite/g++.dg/spellcheck-pr104806.C
new file mode 100644
index 0000000..559e601
--- /dev/null
+++ b/gcc/testsuite/g++.dg/spellcheck-pr104806.C
@@ -0,0 +1,5 @@
+// PR c++/104806
+
+struct S {};
+int main() { S s; s.__d; } // { dg-bogus "'struct S' has no member named '__d'; did you mean '__\[a-z]* '" }
+ // { dg-error "'struct S' has no member named '__d'" "" { target *-*-* } .-1 }