clang-format

Author: Doug Wyatt

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -11529,22 +11529,28 @@ def note_in_evaluating_default_argument : Note<
 def warn_invalid_add_func_effects : Warning<
   "attribute '%0' should not be added via type conversion">,
   InGroup<FunctionEffects>, DefaultIgnore;
-def warn_conflicting_func_effect_override : Warning<
-  "attribute '%0' on overriding function conflicts with base declaration">,
-  InGroup<FunctionEffects>, DefaultIgnore;
+def warn_conflicting_func_effect_override
+    : Warning<"attribute '%0' on overriding function conflicts with base "
+              "declaration">,
+      InGroup<FunctionEffects>,
+      DefaultIgnore;
 def warn_conflicting_func_effects : Warning<
   "effects conflict when merging declarations; kept '%0', discarded '%1'">,
   InGroup<FunctionEffects>, DefaultIgnore;
 def err_func_with_effects_no_prototype : Error<
   "'%0' function must have a prototype">;
 // These are more pedantic: in redeclarations and virtual method overrides,
 // the effect attribute(s) should be restated.
-def warn_mismatched_func_effect_override : Warning<
-  "overriding function is missing '%0' attribute from base declaration">,
-  InGroup<FunctionEffectRedeclarations>, DefaultIgnore;
-def warn_mismatched_func_effect_redeclaration : Warning<
-  "redeclaration is missing '%0' attribute from previous declaration">,
-  InGroup<FunctionEffectRedeclarations>, DefaultIgnore;
+def warn_mismatched_func_effect_override
+    : Warning<"overriding function is missing '%0' attribute from base "
+              "declaration">,
+      InGroup<FunctionEffectRedeclarations>,
+      DefaultIgnore;
+def warn_mismatched_func_effect_redeclaration
+    : Warning<
+          "redeclaration is missing '%0' attribute from previous declaration">,
+      InGroup<FunctionEffectRedeclarations>,
+      DefaultIgnore;
 
 } // end of sema category
 

clang/lib/Sema/SemaDeclCXX.cpp

@@ -18700,8 +18700,9 @@ bool Sema::CheckOverridingFunctionAttributes(CXXMethodDecl *New,
                                                    NewFT->getParamTypes(), EPI);
           New->setType(ModQT);
           if (Errs.empty()) {
-            // A warning here is somewhat pedantic, in a different warning group.
-            // Skip this if there was already a merge conflict, which is more serious.
+            // A warning here is somewhat pedantic, in a different warning
+            // group. Skip this if there was already a merge conflict, which is
+            // more serious.
             Diag(New->getLocation(), diag::warn_mismatched_func_effect_override)
                 << Diff.effectName();
             Diag(Old->getLocation(), diag::note_overridden_virtual_function)