Author: mydeveloperday Date: 2021-11-25T11:05:46Z New Revision: c94667a810e44c44fd355f9f014ffe161d75d761
URL: https://github.com/llvm/llvm-project/commit/c94667a810e44c44fd355f9f014ffe161d75d761 DIFF: https://github.com/llvm/llvm-project/commit/c94667a810e44c44fd355f9f014ffe161d75d761.diff LOG: [clang-format] [PR52595] clang-format does not recognize rvalue references to array https://bugs.llvm.org/show_bug.cgi?id=52595 missing space between `T(&&)` but not between `T (&` due to && being incorrectly thought of as `UnaryOperator` rather than `PointerOrReference` ``` int operator()(T (&)[N]) { return 0; } int operator()(T(&&)[N]) { return 1; } ``` Existing Unit tests are changed because actually I think they are originally incorrect, and are inconsistent with the (&) cases that are 4 or 5 lines above them. Reviewed By: curdeius Differential Revision: https://reviews.llvm.org/D114519 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 2cd57c10425f5..19f30b5ce36ae 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -317,7 +317,7 @@ class AnnotatingParser { // void (^ObjCBlock)(void); bool MightBeFunctionType = !Contexts[Contexts.size() - 2].IsExpression; bool ProbablyFunctionType = - CurrentToken->isOneOf(tok::star, tok::amp, tok::caret); + CurrentToken->isOneOf(tok::star, tok::amp, tok::ampamp, tok::caret); bool HasMultipleLines = false; bool HasMultipleParametersOnALine = false; bool MightBeObjCForRangeLoop = diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 096d6a32ecfce..fb04b4f359859 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -9670,6 +9670,9 @@ TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { verifyFormat("void f() { a->operator()(a & a); }"); verifyFormat("void f() { a.operator()(*a & *a); }"); verifyFormat("void f() { a->operator()(*a * *a); }"); + + verifyFormat("int operator()(T (&&)[N]) { return 1; }"); + verifyFormat("int operator()(T (&)[N]) { return 0; }"); } TEST_F(FormatTest, UnderstandsAttributes) { @@ -21876,6 +21879,7 @@ TEST_F(FormatTest, OperatorSpacing) { verifyFormat("Foo::operator&(void &);", Style); verifyFormat("Foo::operator&();", Style); verifyFormat("operator&(int (&)(), class Foo);", Style); + verifyFormat("operator&&(int (&)(), class Foo);", Style); verifyFormat("Foo::operator&&();", Style); verifyFormat("Foo::operator**();", Style); @@ -21884,7 +21888,7 @@ TEST_F(FormatTest, OperatorSpacing) { verifyFormat("Foo::operator()(void &&);", Style); verifyFormat("Foo::operator&&(void &&);", Style); verifyFormat("Foo::operator&&();", Style); - verifyFormat("operator&&(int(&&)(), class Foo);", Style); + verifyFormat("operator&&(int (&&)(), class Foo);", Style); verifyFormat("operator const nsTArrayRight<E> &()", Style); verifyFormat("[[nodiscard]] operator const nsTArrayRight<E, Allocator> &()", Style); @@ -21935,6 +21939,8 @@ TEST_F(FormatTest, OperatorSpacing) { verifyFormat("Foo::operator&(void&);", Style); verifyFormat("Foo::operator&();", Style); verifyFormat("operator&(int (&)(), class Foo);", Style); + verifyFormat("operator&(int (&&)(), class Foo);", Style); + verifyFormat("operator&&(int (&&)(), class Foo);", Style); verifyFormat("Foo::operator&&();", Style); verifyFormat("Foo::operator void&&();", Style); @@ -21945,7 +21951,7 @@ TEST_F(FormatTest, OperatorSpacing) { verifyFormat("Foo::operator()(void&&);", Style); verifyFormat("Foo::operator&&(void&&);", Style); verifyFormat("Foo::operator&&();", Style); - verifyFormat("operator&&(int(&&)(), class Foo);", Style); + verifyFormat("operator&&(int (&&)(), class Foo);", Style); verifyFormat("operator const nsTArrayLeft<E>&()", Style); verifyFormat("[[nodiscard]] operator const nsTArrayLeft<E, Allocator>&()", Style); @@ -21986,7 +21992,7 @@ TEST_F(FormatTest, OperatorSpacing) { verifyFormat("Foo::operator()(void &&);", Style); verifyFormat("Foo::operator&&(void &&);", Style); verifyFormat("Foo::operator&&();", Style); - verifyFormat("operator&&(int(&&)(), class Foo);", Style); + verifyFormat("operator&&(int (&&)(), class Foo);", Style); } TEST_F(FormatTest, OperatorPassedAsAFunctionPtr) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
