[clang-format][NFC] Turn on some code-changing options one by one

[owenpan]

Summary

For the code-changing options InsertBraces, RemoveBracesLLVM, and RemoveSemicolon, turn the option on only when running the token analyzer pass for it. This improves the run-time and avoids interference from other options.

[rupprecht]

This is causing a test failure: https://buildkite.com/llvm-project/upstream-bazel/builds/48607#0185190c-43f8-43ff-b8bd-fa8ce0b6e2f5
(and likewise running ninja check-clang-unit locally, but I don't have a buildbot link to that)

clang/lib/Format/Format.cpp

3408

This looks like use-after-free. S is captured by reference but the body of the lambda executes after this scope block has ended.

BracesInserter itself takes it by ref but then stores a copy, but by the time the constructor runs, the reference is already dangling.

[rupprecht]

In D140058#4000311, @rupprecht wrote:

This is causing a test failure: https://buildkite.com/llvm-project/upstream-bazel/builds/48607#0185190c-43f8-43ff-b8bd-fa8ce0b6e2f5
(and likewise running ninja check-clang-unit locally, but I don't have a buildbot link to that)

Fixed in 5a06334c51aa75d7f044785a495cf2de5bf13a9c

[owenpan]

In D140058#4000332, @rupprecht wrote:

In D140058#4000311, @rupprecht wrote:

This is causing a test failure: https://buildkite.com/llvm-project/upstream-bazel/builds/48607#0185190c-43f8-43ff-b8bd-fa8ce0b6e2f5
(and likewise running ninja check-clang-unit locally, but I don't have a buildbot link to that)

Fixed in 5a06334c51aa75d7f044785a495cf2de5bf13a9c

Thanks!

clang/lib/Format/Format.cpp

3408

My bad!

clang/lib/Format/Format.cpp

FormatStyle::GetLanguageStyle(FormatStyle::LanguageKind Language) const {
   return StyleSet.Get(Language);
 }
 
 namespace {
 
 class BracesInserter : public TokenAnalyzer {
 public:
   BracesInserter(const Environment &Env, const FormatStyle &Style)
-      : TokenAnalyzer(Env, Style) {
-    this->Style.RemoveBracesLLVM = false;
-  }
+      : TokenAnalyzer(Env, Style) {}
 
   std::pair<tooling::Replacements, unsigned>
   analyze(TokenAnnotator &Annotator,
           SmallVectorImpl<AnnotatedLine *> &AnnotatedLines,
           FormatTokenLexer &Tokens) override {
     AffectedRangeMgr.computeAffectedLines(AnnotatedLines);
     tooling::Replacements Result;
     insertBraces(AnnotatedLines, Result);
void insertBraces(SmallVectorImpl<AnnotatedLine *> &Lines,
     }
     assert(OpeningBraceSurplus == 0);
   }
 };
 
 class BracesRemover : public TokenAnalyzer {
 public:
   BracesRemover(const Environment &Env, const FormatStyle &Style)
-      : TokenAnalyzer(Env, Style) {
-    this->Style.InsertBraces = false;
-  }
+      : TokenAnalyzer(Env, Style) {}
 
   std::pair<tooling::Replacements, unsigned>
   analyze(TokenAnnotator &Annotator,
           SmallVectorImpl<AnnotatedLine *> &AnnotatedLines,
           FormatTokenLexer &Tokens) override {
     AffectedRangeMgr.computeAffectedLines(AnnotatedLines);
     tooling::Replacements Result;
     removeBraces(AnnotatedLines, Result);

 std::pair<tooling::Replacements, unsigned>
 reformat(const FormatStyle &Style, StringRef Code,
          ArrayRef<tooling::Range> Ranges, unsigned FirstStartColumn,
          unsigned NextStartColumn, unsigned LastStartColumn, StringRef FileName,
          FormattingAttemptStatus *Status) {
   FormatStyle Expanded = Style;
   expandPresetsBraceWrapping(Expanded);
   expandPresetsSpaceBeforeParens(Expanded);
+  Expanded.InsertBraces = false;
+  Expanded.RemoveBracesLLVM = false;
+  Expanded.RemoveSemicolon = false;
   switch (Expanded.RequiresClausePosition) {
   case FormatStyle::RCPS_SingleLine:
   case FormatStyle::RCPS_WithPreceding:
     Expanded.IndentRequiresClause = false;
     break;
   default:
     break;
   }
if (Style.QualifierAlignment != FormatStyle::QAS_Leave) {
         return QualifierAlignmentFixer(Env, Expanded, Code, Ranges,
                                        FirstStartColumn, NextStartColumn,
                                        LastStartColumn, FileName)
             .process();
       });
     }
 
     if (Style.InsertBraces) {
+      FormatStyle S = Expanded;
+      S.InsertBraces = true;
       Passes.emplace_back([&](const Environment &Env) {
-        return BracesInserter(Env, Expanded).process(/*SkipAnnotation=*/true);
+        return BracesInserter(Env, S).process(/*SkipAnnotation=*/true);
       });
     }
 
     if (Style.RemoveBracesLLVM) {
+      FormatStyle S = Expanded;
+      S.RemoveBracesLLVM = true;
       Passes.emplace_back([&](const Environment &Env) {
-        return BracesRemover(Env, Expanded).process(/*SkipAnnotation=*/true);
+        return BracesRemover(Env, S).process(/*SkipAnnotation=*/true);
       });
     }
 
     if (Style.RemoveSemicolon) {
+      FormatStyle S = Expanded;
+      S.RemoveSemicolon = true;
       Passes.emplace_back([&](const Environment &Env) {
-        return SemiRemover(Env, Expanded).process(/*SkipAnnotation=*/true);
+        return SemiRemover(Env, S).process(/*SkipAnnotation=*/true);
       });
     }
 
     if (Style.FixNamespaceComments) {
       Passes.emplace_back([&](const Environment &Env) {
         return NamespaceEndCommentsFixer(Env, Expanded).process();
       });
     }