Author: mydeveloperday Date: 2022-01-13T07:57:45Z New Revision: 7ee4236789bb8272cf3a2feedd75336e52f33e78
URL: https://github.com/llvm/llvm-project/commit/7ee4236789bb8272cf3a2feedd75336e52f33e78 DIFF: https://github.com/llvm/llvm-project/commit/7ee4236789bb8272cf3a2feedd75336e52f33e78.diff LOG: [clang-format] clang-format eats space in front of attributes for operator delete https://github.com/llvm/llvm-project/issues/27037 Sorry its taken so long to get to this issue! (got it before it hit its 6th birthday!) ``` void operator delete(void *foo)ATTRIB; ``` (void *foo) is incorrectly determined to be a C-Style Cast resulting in the space being removed after the ) and before the attrib, due to the detection of ``` delete (A* )a; ``` The following was previously unaffected ``` void operator new(void *foo) ATTRIB; ``` Fixes #27037 Reviewed By: curdeius, HazardyKnusperkeks Differential Revision: https://reviews.llvm.org/D116920 Added: Modified: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/FormatTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 22c56537bb9e0..6181880b64569 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1893,6 +1893,13 @@ class AnnotatingParser { LeftOfParens = LeftOfParens->MatchingParen->Previous; } + // The Condition directly below this one will see the operator arguments + // as a (void *foo) cast. + // void operator delete(void *foo) ATTRIB; + if (LeftOfParens->Tok.getIdentifierInfo() && LeftOfParens->Previous && + LeftOfParens->Previous->is(tok::kw_operator)) + return false; + // If there is an identifier (or with a few exceptions a keyword) right // before the parentheses, this is unlikely to be a cast. if (LeftOfParens->Tok.getIdentifierInfo() && diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index d3e4479a5aa84..0332821aa6b0c 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -9459,6 +9459,11 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) { " new (aaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaa))\n" " typename aaaaaaaaaaaaaaaaaaaaaaaa();"); verifyFormat("delete[] h->p;"); + + verifyFormat("void operator delete(void *foo) ATTRIB;"); + verifyFormat("void operator new(void *foo) ATTRIB;"); + verifyFormat("void operator delete[](void *foo) ATTRIB;"); + verifyFormat("void operator delete(void *ptr) noexcept;"); } TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
