[clang-format] Fix an assertion failure in RemoveSemicolon

Fixes llvm#117290.
owenca · Nov 24, 2024 · 9a2a93f · 9a2a93f
1 parent aa2d084
commit 9a2a93f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
@@ -2325,7 +2325,7 @@ class SemiRemover : public TokenAnalyzer {
 private:
   void removeSemi(TokenAnnotator &Annotator,
                   SmallVectorImpl<AnnotatedLine *> &Lines,
-                  tooling::Replacements &Result) {
+                  tooling::Replacements &Result, bool Children = false) {
     auto PrecededByFunctionRBrace = [](const FormatToken &Tok) {
       const auto *Prev = Tok.Previous;
       if (!Prev || Prev->isNot(tok::r_brace))
@@ -2337,10 +2337,12 @@ class SemiRemover : public TokenAnalyzer {
     const auto End = Lines.end();
     for (auto I = Lines.begin(); I != End; ++I) {
       const auto Line = *I;
-      removeSemi(Annotator, Line->Children, Result);
+      if (!Line->Children.empty())
+        removeSemi(Annotator, Line->Children, Result, /*Children=*/true);
       if (!Line->Affected)
         continue;
-      Annotator.calculateFormattingInformation(*Line);
+      if (!Children)
+        Annotator.calculateFormattingInformation(*Line);
       const auto NextLine = I + 1 == End ? nullptr : I[1];
       for (auto Token = Line->First; Token && !Token->Finalized;
            Token = Token->Next) {

diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
@@ -27386,6 +27386,13 @@ TEST_F(FormatTest, RemoveSemicolon) {
                Style);
 #endif
 
+  verifyFormat("auto sgf = [] {\n"
+               "  ogl = {\n"
+               "      a, b, c, d, e,\n"
+               "  };\n"
+               "};",
+               Style);
+
   Style.TypenameMacros.push_back("STRUCT");
   verifyFormat("STRUCT(T, B) { int i; };", Style);
 }