Author: mydeveloperday Date: 2021-11-23T10:36:06Z New Revision: e7cb3283c8032d89e81b3958b0fd73064ed5e839
URL: https://github.com/llvm/llvm-project/commit/e7cb3283c8032d89e81b3958b0fd73064ed5e839 DIFF: https://github.com/llvm/llvm-project/commit/e7cb3283c8032d89e81b3958b0fd73064ed5e839.diff LOG: [clang-format] [PR52527] can join * with /* to form an outside of comment error C4138 https://bugs.llvm.org/show_bug.cgi?id=52527 The follow patch ensures there is always a space between * and /* to prevent transforming ``` void foo(* /* comment */)(int bar); ``` into ``` void foo(*/* comment */)(int bar); ``` Differential Revision: https://reviews.llvm.org/D114142 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 f3f63b4cad234..817bda1780de2 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -3246,6 +3246,12 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line, }; if (Right.Tok.getIdentifierInfo() && Left.Tok.getIdentifierInfo()) return true; // Never ever merge two identifiers. + + // Leave a space between * and /* to avoid C4138 `comment end` found outside + // of comment. + if (Left.is(tok::star) && Right.is(tok::comment)) + return true; + if (Style.isCpp()) { if (Left.is(tok::kw_operator)) return Right.is(tok::coloncolon); diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 6507cbefc5a90..8c8d7a465c795 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -9439,6 +9439,13 @@ TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { verifyFormat("void f() { &(*I).first; }"); verifyIndependentOfContext("f(b * /* confusing comment */ ++c);"); + verifyFormat("f(* /* confusing comment */ foo);"); + verifyFormat("void (* /*deleter*/)(const Slice &key, void *value)"); + verifyFormat("void foo(int * // this is the first paramters\n" + " ,\n" + " int second);"); + verifyFormat("double term = a * // first\n" + " b;"); verifyFormat( "int *MyValues = {\n" " *A, // Operator detection might be confused by the '{'\n" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
