Author: Luis Penagos Date: 2021-05-04T12:28:49+02:00 New Revision: 8fa56f7ededcbe28cbbb810b5d261b72ab0d8035
URL: https://github.com/llvm/llvm-project/commit/8fa56f7ededcbe28cbbb810b5d261b72ab0d8035 DIFF: https://github.com/llvm/llvm-project/commit/8fa56f7ededcbe28cbbb810b5d261b72ab0d8035.diff LOG: [clang-format] Prevent extraneous space insertion in bitshift operators This serves to augment the improvements made in https://reviews.llvm.org/D86581. It prevents clang-format from interpreting bitshift operators as template arguments in certain circumstances. This is an attempt at fixing https://bugs.llvm.org/show_bug.cgi?id=49868 Reviewed By: MyDeveloperDay, krasimir Differential Revision: https://reviews.llvm.org/D100778 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 719bb3fdd0665..54b73d6e75bb6 100755 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -116,10 +116,17 @@ class AnnotatingParser { while (CurrentToken) { if (CurrentToken->is(tok::greater)) { // Try to do a better job at looking for ">>" within the condition of - // a statement. + // a statement. Conservatively insert spaces between consecutive ">" + // tokens to prevent splitting right bitshift operators and potentially + // altering program semantics. This check is overly conservative and + // will prevent spaces from being inserted in select nested template + // parameter cases, but should not alter program semantics. if (CurrentToken->Next && CurrentToken->Next->is(tok::greater) && Left->ParentBracket != tok::less && - isKeywordWithCondition(*Line.First)) + (isKeywordWithCondition(*Line.First) || + CurrentToken->getStartOfNonWhitespace() == + CurrentToken->Next->getStartOfNonWhitespace().getLocWithOffset( + -1))) return false; Left->MatchingParen = CurrentToken; CurrentToken->MatchingParen = Left; diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 38b4c654f817a..1ba43e3eaf198 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -8007,6 +8007,8 @@ TEST_F(FormatTest, UnderstandsTemplateParameters) { verifyFormat("a<int> = 1;", Style); verifyFormat("a<int> >>= 1;", Style); + verifyFormat("test < a | b >> c;"); + verifyFormat("test<test<a | b>> c;"); verifyFormat("test >> a >> b;"); verifyFormat("test << a >> b;"); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits