Merged main:a87638596a78 into amd-gfx:d1338c27690c

Local branch amd-gfx d1338c2 Merged main:159614a52f0b into amd-gfx:71bb95469251
Remote branch main a876385 Revert tests missed in b997ff4

Author: SC llvm team

clang/lib/Format/TokenAnnotator.cpp

@@ -3544,7 +3544,7 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const {
           }
         }
       }
-    } else if (Current->SpacesRequiredBefore == 0 &&
+    } else if (!Current->Finalized && Current->SpacesRequiredBefore == 0 &&
                spaceRequiredBefore(Line, *Current)) {
       Current->SpacesRequiredBefore = 1;
     }

clang/test/CXX/over/over.match/over.match.funcs/over.match.oper/p3-2a.cpp

@@ -324,57 +324,6 @@ bool x = X() == X(); // expected-warning {{ambiguous}}
 }
 } // namespace P2468R2
 
-namespace GH53954{
-namespace friend_template_1 {
-struct P {
-    template <class T>
-    friend bool operator==(const P&, const T&); // expected-note {{candidate}} \
-                                                // expected-note {{ambiguous candidate function with reversed arguments}}
-};
-struct A : public P {};
-struct B : public P {};
-bool check(A a, B b) { return a == b; } // expected-warning {{use of overloaded operator '==' (with operand types 'A' and 'B') to be ambiguous}}
-}
-
-namespace friend_template_2 {
-struct P {
-    template <class T>
-    friend bool operator==(const T&, const P&); // expected-note {{candidate}} \
-                                                // expected-note {{ambiguous candidate function with reversed arguments}}
-};
-struct A : public P {};
-struct B : public P {};
-bool check(A a, B b) { return a == b; } // expected-warning {{use of overloaded operator '==' (with operand types 'A' and 'B') to be ambiguous}}
-}
-
-namespace member_template {
-struct P {
-  template<class S>
-  bool operator==(const S &) const; // expected-note {{candidate}} \
-                                    // expected-note {{ambiguous candidate function with reversed arguments}}
-};
-struct A : public P {};
-struct B : public P {};
-bool check(A a, B b) { return a == b; } // expected-warning {{use of overloaded operator '==' (with operand types 'A' and 'B') to be ambiguous}}
-}
-
-namespace non_member_template_1 {
-struct P {};
-template<class S>
-bool operator==(const P&, const S &); // expected-note {{candidate}} \
-                                      // expected-note {{ambiguous candidate function with reversed arguments}}
-
-struct A : public P {};
-struct B : public P {};
-bool check(A a, B b) { return a == b; } // expected-warning {{use of overloaded operator '==' (with operand types 'A' and 'B') to be ambiguous}}
-
-template<class S>
-bool operator!=(const P&, const S &);
-bool fine(A a, B b) { return a == b; } // Ok. Found a matching operator!=.
-}
-}
-
-
 namespace ADL_GH68901{
 namespace test1 {
 namespace A {
@@ -477,17 +426,6 @@ bool i(X x) {
 } // namespace test2
 } // namespace function_scope_operator_eqeq
 
-namespace non_member_template_2 {
-struct P {};
-template<class S>
-bool operator==(const S&, const P&); // expected-note {{candidate}} \
-                                     // expected-note {{ambiguous candidate function with reversed arguments}}
-
-struct A : public P {};
-struct B : public P {};
-bool check(A a, B b) { return a == b; } // expected-warning {{use of overloaded operator '==' (with operand types 'A' and 'B') to be ambiguous}}
-}
-
 #else // NO_ERRORS
 
 namespace problem_cases {

clang/unittests/Format/FormatTest.cpp

@@ -26459,6 +26459,25 @@ TEST_F(FormatTest, AllowBreakBeforeNoexceptSpecifier) {
                Style);
 }
 
+TEST_F(FormatTest, PPBranchesInBracedInit) {
+  verifyFormat("A a_{kFlag1,\n"
+               "#if BUILD_FLAG\n"
+               "     kFlag2,\n"
+               "#else\n"
+               "     kFlag3,\n"
+               "#endif\n"
+               "     kFlag4};",
+               "A a_{\n"
+               "  kFlag1,\n"
+               "#if BUILD_FLAG\n"
+               "      kFlag2,\n"
+               "#else\n"
+               "      kFlag3,\n"
+               "#endif\n"
+               "      kFlag4\n"
+               "};");
+}
+
 } // namespace
 } // namespace test
 } // namespace format