llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: Owen Pan (owenca) <details> <summary>Changes</summary> Fix #<!-- -->138484 --- Full diff: https://github.com/llvm/llvm-project/pull/138799.diff 3 Files Affected: - (modified) clang/lib/Format/FormatToken.h (+8) - (modified) clang/lib/Format/TokenAnnotator.cpp (+2-1) - (modified) clang/unittests/Format/TokenAnnotatorTest.cpp (+6) ``````````diff diff --git a/clang/lib/Format/FormatToken.h b/clang/lib/Format/FormatToken.h index 946cd7b81587f..b570171d032ac 100644 --- a/clang/lib/Format/FormatToken.h +++ b/clang/lib/Format/FormatToken.h @@ -711,6 +711,14 @@ struct FormatToken { tok::objc_package, tok::objc_private); } + bool isObjCLifetimeQualifier(const FormatStyle &Style) const { + if (Style.Language != FormatStyle::LK_ObjC || !TokenText.starts_with("__")) + return false; + const auto Qualifier = TokenText.substr(2); + return Qualifier == "autoreleasing" || Qualifier == "strong" || + Qualifier == "weak" || Qualifier == "unsafe_unretained"; + } + /// Returns whether \p Tok is ([{ or an opening < of a template or in /// protos. bool opensScope() const { diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index ac6551b2bd1ad..f0f9207564ab1 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -3100,7 +3100,8 @@ class AnnotatingParser { if (NextNextToken) { if (NextNextToken->is(tok::arrow)) return TT_BinaryOperator; - if (NextNextToken->isPointerOrReference()) { + if (NextNextToken->isPointerOrReference() && + !NextToken->isObjCLifetimeQualifier(Style)) { NextNextToken->setFinalizedType(TT_BinaryOperator); return TT_BinaryOperator; } diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index bcb2b6f33d1ad..7982ccb167b53 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -411,6 +411,12 @@ TEST_F(TokenAnnotatorTest, UnderstandsUsesOfStarAndAmp) { ASSERT_EQ(Tokens.size(), 27u) << Tokens; EXPECT_TOKEN(Tokens[16], tok::star, TT_BinaryOperator); EXPECT_TOKEN(Tokens[22], tok::star, TT_BinaryOperator); + + Tokens = annotate("NSError *__autoreleasing *foo;", + getLLVMStyle(FormatStyle::LK_ObjC)); + ASSERT_EQ(Tokens.size(), 7u) << Tokens; + EXPECT_TOKEN(Tokens[1], tok::star, TT_PointerOrReference); + EXPECT_TOKEN(Tokens[3], tok::star, TT_PointerOrReference); } TEST_F(TokenAnnotatorTest, UnderstandsUsesOfPlusAndMinus) { `````````` </details> https://github.com/llvm/llvm-project/pull/138799 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
