Allow struct q{int q;~q();} (#88597)

[nabijaczleweli]

Based on #88597 (comment)

[github-actions]

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be
notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write
permissions for the repository. In which case you can instead tag reviewers by
name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review
by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate
is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

[llvmbot]

@llvm/pr-subscribers-clang

Author: наб (nabijaczleweli)

Changes

Based on #88597 (comment)

---

Full diff: https://github.com/llvm/llvm-project/pull/88673.diff

2 Files Affected:

• (modified) clang/include/clang/Basic/DiagnosticSemaKinds.td (-2)
• (modified) clang/lib/Sema/SemaExprCXX.cpp (+2-3)

diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 5ec0218aedfe86..c8c3f2de81f82a 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -2187,8 +2187,6 @@ def err_undeclared_destructor_name : Error< "undeclared identifier %0 in destructor name">; def err_destructor_name : Error< "expected the class name after '~' to name the enclosing class">; -def err_destructor_name_nontype : Error< - "identifier %0 after '~' in destructor name does not name a type">; def err_destructor_expr_mismatch : Error< "identifier %0 in object destruction expression does not name the type " "%1 of the object being destroyed">; diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 25f23a3abf1718..bb93803c6384d4 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -448,9 +448,8 @@ ParsedType Sema::getDestructorName(const IdentifierInfo &II, Diag(NameLoc, diag::err_destructor_expr_nontype) << &II << MakeFixItHint(); } - } else { - Diag(NameLoc, SearchType.isNull() ? diag::err_destructor_name_nontype - : diag::err_destructor_expr_mismatch) + } else if(!SearchType.isNull()) { + Diag(NameLoc, diag::err_destructor_expr_mismatch) << &II << SearchType << MakeFixItHint(); } 

[github-actions]

✅ With the latest revision this PR passed the C/C++ code formatter.