[libcxx-commits] [libcxxabi] 1afd889 - [gn build] Make sync_source_lists_from_cmake handle one-line sources lines

Fri Jul 17 08:53:55 PDT 2020

Author: Nico Weber
Date: 2020-07-17T11:53:42-04:00
New Revision: 1afd889d0b4352ddaef33680ace94045938591f1

URL: https://github.com/llvm/llvm-project/commit/1afd889d0b4352ddaef33680ace94045938591f1
DIFF: https://github.com/llvm/llvm-project/commit/1afd889d0b4352ddaef33680ace94045938591f1.diff

LOG: [gn build] Make sync_source_lists_from_cmake handle one-line sources lines

sync_source_lists_from_cmake now also looks for source files in
`sources += [ "foo.cc" ]` lines, which allows us to remove most
`# Make `gn format` not collapse this` comments.

(sync_source_lists_from_cmake doesn't look for `foo_headers += [...]`
still, so the comment is still needed in two places for that.)

No intentional behavior change.

Added: 
    

Modified: 
    libcxxabi/src/CMakeLists.txt
    llvm/utils/gn/build/sync_source_lists_from_cmake.py
    llvm/utils/gn/secondary/clang-tools-extra/clang-apply-replacements/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-apply-replacements/tool/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/tool/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-doc/tool/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/tool/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-move/tool/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-query/tool/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/tool/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/tool/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clangd/index/dex/dexp/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clangd/index/remote/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clangd/index/remote/unimplemented/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clangd/indexer/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/framework/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/test-client/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn
    llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn
    llvm/utils/gn/secondary/clang/lib/CrossTU/BUILD.gn
    llvm/utils/gn/secondary/clang/lib/FrontendTool/BUILD.gn
    llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn
    llvm/utils/gn/secondary/clang/lib/Tooling/ASTDiff/BUILD.gn
    llvm/utils/gn/secondary/clang/tools/arcmt-test/BUILD.gn
    llvm/utils/gn/secondary/clang/tools/c-arcmt-test/BUILD.gn
    llvm/utils/gn/secondary/clang/tools/clang-check/BUILD.gn
    llvm/utils/gn/secondary/clang/tools/clang-diff/BUILD.gn
    llvm/utils/gn/secondary/clang/tools/clang-extdef-mapping/BUILD.gn
    llvm/utils/gn/secondary/clang/tools/clang-format/BUILD.gn
    llvm/utils/gn/secondary/clang/tools/clang-import-test/BUILD.gn
    llvm/utils/gn/secondary/clang/tools/clang-offload-bundler/BUILD.gn
    llvm/utils/gn/secondary/clang/tools/clang-offload-wrapper/BUILD.gn
    llvm/utils/gn/secondary/clang/tools/clang-rename/BUILD.gn
    llvm/utils/gn/secondary/clang/tools/clang-scan-deps/BUILD.gn
    llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn
    llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn
    llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
    llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn
    llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/cfi/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/sanitizer_common/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn
    llvm/utils/gn/secondary/libcxx/src/BUILD.gn
    llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn
    llvm/utils/gn/secondary/libunwind/src/BUILD.gn
    llvm/utils/gn/secondary/lld/MinGW/BUILD.gn
    llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
    llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn
    llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn
    llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
    llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Bitstream/Reader/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/MCJIT/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Extensions/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/IRReader/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/LineEditor/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/AArch64/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/AArch64/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/AArch64/Utils/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/ARM/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/ARM/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/ARM/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/ARM/Utils/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/AVR/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/AVR/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/AVR/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/BPF/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/BPF/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/BPF/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Lanai/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Lanai/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Lanai/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Mips/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Mips/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Mips/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/NVPTX/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/RISCV/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/RISCV/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/RISCV/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Sparc/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Sparc/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/Sparc/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/X86/Disassembler/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/X86/TargetInfo/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/ToolDrivers/llvm-dlltool/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/ToolDrivers/llvm-lib/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Transforms/CFGuard/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Transforms/Hello/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/WindowsManifest/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/bugpoint-passes/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llc/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/lli/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/lli/ChildTarget/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-ar/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-as/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-bcanalyzer/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-cat/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-cvtres/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-cxxfilt/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-dis/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/AArch64/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/Mips/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/PowerPC/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-extract/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-gsymutil/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-ifs/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-isel-fuzzer/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-link/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-lipo/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-lto/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-lto2/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-modextract/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-mt/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-nm/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-opt-fuzzer/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-profdata/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-rtdyld/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-size/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-split/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-strings/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/llvm-undname/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/sanstats/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/verify-uselistorder/BUILD.gn
    llvm/utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn
    llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn
    llvm/utils/gn/secondary/llvm/utils/FileCheck/BUILD.gn
    llvm/utils/gn/secondary/llvm/utils/count/BUILD.gn
    llvm/utils/gn/secondary/llvm/utils/not/BUILD.gn
    llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn
    llvm/utils/gn/secondary/llvm/utils/yaml-bench/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
index 42bec421d2be..050356911528 100644

--- a/libcxxabi/src/CMakeLists.txt
+++ b/libcxxabi/src/CMakeLists.txt
@@ -20,7 +20,9 @@ set(LIBCXXABI_SOURCES
 )
 
 if (LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS)
-  list(APPEND LIBCXXABI_SOURCES stdlib_new_delete.cpp)
+  list(APPEND LIBCXXABI_SOURCES
+    stdlib_new_delete.cpp
+  )
 endif()
 
 if (LIBCXXABI_ENABLE_EXCEPTIONS)

diff  --git a/llvm/utils/gn/build/sync_source_lists_from_cmake.py b/llvm/utils/gn/build/sync_source_lists_from_cmake.py
index 46a779ef376c..b88b3b800771 100755
--- a/llvm/utils/gn/build/sync_source_lists_from_cmake.py
+++ b/llvm/utils/gn/build/sync_source_lists_from_cmake.py
@@ -59,6 +59,10 @@ def git_out(args):
 
     # Matches e.g. |   "foo.cpp",|, captures |foo| in group 1.
     gn_cpp_re = re.compile(r'^\s*"([^"]+\.(?:cpp|c|h|S))",$', re.MULTILINE)
+    # Matches e.g. |   bar_sources = [ "foo.cpp" ]|, captures |foo| in group 1.
+    gn_cpp_re2 = re.compile(
+        r'^\s*(?:.*_)?sources \+?= \[ "([^"]+\.(?:cpp|c|h|S))" ]$',
+        re.MULTILINE)
     # Matches e.g. |   foo.cpp|, captures |foo| in group 1.
     cmake_cpp_re = re.compile(r'^\s*([A-Za-z_0-9./-]+\.(?:cpp|c|h|S))$',
                               re.MULTILINE)
@@ -88,6 +92,7 @@ def find_gitrev(touched_line, in_file):
         def get_sources(source_re, text):
             return set([m.group(1) for m in source_re.finditer(text)])
         gn_cpp = get_sources(gn_cpp_re, open(gn_file).read())
+        gn_cpp |= get_sources(gn_cpp_re2, open(gn_file).read())
         cmake_cpp = get_sources(cmake_cpp_re, open(cmake_file).read())
 
         if gn_cpp == cmake_cpp:

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-apply-replacements/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-apply-replacements/BUILD.gn
index 81d339cf5c08..9a43105dc6ae 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-apply-replacements/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-apply-replacements/BUILD.gn
@@ -10,8 +10,5 @@ static_library("clang-apply-replacements") {
     "//llvm/lib/Support",
   ]
   include_dirs = [ "include" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "lib/Tooling/ApplyReplacements.cpp",
-  ]
+  sources = [ "lib/Tooling/ApplyReplacements.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-apply-replacements/tool/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-apply-replacements/tool/BUILD.gn
index f703f9ac0c6e..6bb86188c504 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-apply-replacements/tool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-apply-replacements/tool/BUILD.gn
@@ -10,8 +10,5 @@ executable("clang-apply-replacements") {
     "//llvm/lib/Support",
   ]
   include_dirs = [ "../include" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangApplyReplacementsMain.cpp",
-  ]
+  sources = [ "ClangApplyReplacementsMain.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/BUILD.gn
index 982f1d4cec81..f83404732489 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/BUILD.gn
@@ -13,8 +13,5 @@ static_library("clang-change-namespace") {
     "//clang/lib/Tooling/Core",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ChangeNamespace.cpp",
-  ]
+  sources = [ "ChangeNamespace.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/tool/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/tool/BUILD.gn
index b52c6f85d6e2..01580370b21f 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/tool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/tool/BUILD.gn
@@ -13,8 +13,5 @@ executable("clang-change-namespace") {
     "//clang/lib/Tooling/Core",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangChangeNamespace.cpp",
-  ]
+  sources = [ "ClangChangeNamespace.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-doc/tool/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-doc/tool/BUILD.gn
index c3a84bbc2d88..bfc1a96cdab0 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-doc/tool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-doc/tool/BUILD.gn
@@ -10,8 +10,5 @@ executable("clang-doc") {
     "//clang/lib/Tooling/Core",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangDocMain.cpp",
-  ]
+  sources = [ "ClangDocMain.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/BUILD.gn
index b4bada949598..8085641bc776 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/BUILD.gn
@@ -11,8 +11,5 @@ executable("find-all-symbols") {
     "//clang/lib/Tooling",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "FindAllSymbolsMain.cpp",
-  ]
+  sources = [ "FindAllSymbolsMain.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/BUILD.gn
index 7dc9b25aff57..498c15ef8850 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/plugin/BUILD.gn
@@ -12,8 +12,5 @@ static_library("plugin") {
     "//llvm/utils/gn/build/libs/pthread",
   ]
 
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "IncludeFixerPlugin.cpp",
-  ]
+  sources = [ "IncludeFixerPlugin.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/tool/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/tool/BUILD.gn
index a1e9a92ff9ad..4759feb18753 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/tool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-include-fixer/tool/BUILD.gn
@@ -12,8 +12,5 @@ executable("clang-include-fixer") {
     "//clang/lib/Tooling/Core",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangIncludeFixer.cpp",
-  ]
+  sources = [ "ClangIncludeFixer.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-move/tool/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-move/tool/BUILD.gn
index 611d82de48fd..3e08ba2cbf4c 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-move/tool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-move/tool/BUILD.gn
@@ -13,8 +13,5 @@ executable("clang-move") {
     "//clang/lib/Tooling/Core",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangMove.cpp",
-  ]
+  sources = [ "ClangMove.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-query/tool/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-query/tool/BUILD.gn
index 0000e0abb112..faeb573ebebc 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-query/tool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-query/tool/BUILD.gn
@@ -11,8 +11,5 @@ executable("clang-query") {
     "//clang/lib/Tooling",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangQuery.cpp",
-  ]
+  sources = [ "ClangQuery.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/BUILD.gn
index 4b4c2c320664..3b13c0517307 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/BUILD.gn
@@ -11,8 +11,5 @@ static_library("clang-reorder-fields") {
     "//clang/lib/Tooling/Core",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ReorderFieldsAction.cpp",
-  ]
+  sources = [ "ReorderFieldsAction.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/tool/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/tool/BUILD.gn
index 5c16dd206adc..ee8bbc729819 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/tool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/tool/BUILD.gn
@@ -9,8 +9,5 @@ executable("clang-reorder-fields") {
     "//clang/lib/Tooling",
     "//clang/lib/Tooling/Core",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangReorderFields.cpp",
-  ]
+  sources = [ "ClangReorderFields.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn
index f3a830503b50..4e090d685140 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/plugin/BUILD.gn
@@ -12,8 +12,5 @@ static_library("plugin") {
     "//clang/lib/Tooling",
   ]
 
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangTidyPlugin.cpp",
-  ]
+  sources = [ "ClangTidyPlugin.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/tool/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/tool/BUILD.gn
index bfe696cad463..3f06214498d6 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/tool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/tool/BUILD.gn
@@ -14,7 +14,6 @@ executable("clang-tidy") {
     "//llvm/lib/Target:AllTargetsInfos",
   ]
   sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
     "ClangTidyMain.cpp",
     "ClangTidyToolMain.cpp",
   ]

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/dex/dexp/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/dex/dexp/BUILD.gn
index 98ed29388bce..85b4e52f1b1a 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/dex/dexp/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/dex/dexp/BUILD.gn
@@ -9,8 +9,5 @@ executable("dexp") {
     "//llvm/lib/Support",
   ]
   include_dirs = [ "../../.." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "Dexp.cpp",
-  ]
+  sources = [ "Dexp.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/remote/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/remote/BUILD.gn
index de3c8f8b395b..6bb246d894ee 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/remote/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/remote/BUILD.gn
@@ -8,9 +8,6 @@ source_set("remote") {
   include_dirs = [ "../.." ]
   sources = []
   if (false) {
-    sources += [
-      # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-      "Client.cpp",
-    ]
+    sources += [ "Client.cpp" ]
   }
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/remote/unimplemented/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/remote/unimplemented/BUILD.gn
index 3343fc9c315b..708e0f54a086 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/remote/unimplemented/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/index/remote/unimplemented/BUILD.gn
@@ -6,8 +6,5 @@ source_set("unimplemented") {
     "//llvm/lib/Support",
   ]
   include_dirs = [ "../../.." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "UnimplementedClient.cpp",
-  ]
+  sources = [ "UnimplementedClient.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/indexer/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/indexer/BUILD.gn
index 504b00c5808f..15ce87eaf894 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/indexer/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/indexer/BUILD.gn
@@ -11,8 +11,5 @@ executable("clangd-indexer") {
     "//llvm/lib/Support",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "IndexerMain.cpp",
-  ]
+  sources = [ "IndexerMain.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn
index 94047e3997d7..6d535215156b 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/tool/BUILD.gn
@@ -25,8 +25,5 @@ executable("clangd") {
   }
 
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangdMain.cpp",
-  ]
+  sources = [ "ClangdMain.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
index bf373e351836..d87d3d264871 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/xpc/BUILD.gn
@@ -9,8 +9,5 @@ unittest("ClangdXpcTests") {
     "//llvm/lib/Testing/Support",
   ]
   include_dirs = [ "//clang-tools-extra/clangd" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ConversionTests.cpp",
-  ]
+  sources = [ "ConversionTests.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn
index e15340ec990a..0d375392ae25 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn
@@ -7,10 +7,7 @@ static_library("conversions") {
     "//llvm/lib/Support",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "Conversion.cpp",
-  ]
+  sources = [ "Conversion.cpp" ]
 }
 
 static_library("transport") {
@@ -23,8 +20,5 @@ static_library("transport") {
     "//llvm/lib/Support",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "XPCTransport.cpp",
-  ]
+  sources = [ "XPCTransport.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/framework/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/framework/BUILD.gn
index 151d652ec891..5bc400378f2b 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/framework/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/framework/BUILD.gn
@@ -63,10 +63,7 @@ bundle_data("clangdxpc_bundle_info_plist") {
 
 shared_library("ClangdXPCLib") {
   deps = [ "//clang-tools-extra/clangd/tool:clangd" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangdXPC.cpp",
-  ]
+  sources = [ "ClangdXPC.cpp" ]
 }
 
 bundle_data("clangdxpc_bundle_executable") {

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/test-client/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/test-client/BUILD.gn
index 40f3aff911a0..ffb4f69d3d53 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/test-client/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/test-client/BUILD.gn
@@ -14,8 +14,5 @@ executable("clangd-xpc-test-client") {
   ]
 
   include_dirs = [ "../.." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangdXPCTestClient.cpp",
-  ]
+  sources = [ "ClangdXPCTestClient.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn
index 4582a978899d..cdd30c9f7782 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-apply-replacements/BUILD.gn
@@ -9,8 +9,5 @@ unittest("ClangApplyReplacementsTests") {
     "//clang/lib/Tooling/Refactoring",
   ]
   include_dirs = [ "//clang-tools-extra/clang-apply-replacements/include" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ApplyReplacementsTest.cpp",
-  ]
+  sources = [ "ApplyReplacementsTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn
index 2b6123ee1050..1e1161bc85c0 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-change-namespace/BUILD.gn
@@ -21,8 +21,5 @@ unittest("ClangChangeNamespaceTests") {
     # We'd like clang/unittests/Tooling/RewriterTestContext.h in the test.
     "//clang",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ChangeNamespaceTests.cpp",
-  ]
+  sources = [ "ChangeNamespaceTests.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn
index 47f23186d10d..87bfaa9c6f36 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/BUILD.gn
@@ -14,8 +14,5 @@ unittest("FindAllSymbolsTests") {
     "//llvm/lib/Support",
   ]
   include_dirs = [ "//clang-tools-extra/clang-include-fixer/find-all-symbols" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "FindAllSymbolsTests.cpp",
-  ]
+  sources = [ "FindAllSymbolsTests.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn
index 217c820c8409..5fa983f5b7d3 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-move/BUILD.gn
@@ -21,8 +21,5 @@ unittest("ClangMoveTests") {
     # We'd like clang/unittests/Tooling/RewriterTestContext.h in the test.
     "//clang",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangMoveTests.cpp",
-  ]
+  sources = [ "ClangMoveTests.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/lib/CrossTU/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/CrossTU/BUILD.gn
index 83411bac3ead..0f5cffaf451a 100644
--- a/llvm/utils/gn/secondary/clang/lib/CrossTU/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/CrossTU/BUILD.gn
@@ -8,8 +8,5 @@ static_library("CrossTU") {
     "//clang/lib/Index",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "CrossTranslationUnit.cpp",
-  ]
+  sources = [ "CrossTranslationUnit.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/lib/FrontendTool/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/FrontendTool/BUILD.gn
index cd7838885067..5f8f02159158 100644
--- a/llvm/utils/gn/secondary/clang/lib/FrontendTool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/FrontendTool/BUILD.gn
@@ -23,8 +23,5 @@ static_library("FrontendTool") {
   if (clang_enable_static_analyzer) {
     deps += [ "//clang/lib/StaticAnalyzer/Frontend" ]
   }
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ExecuteCompilerInvocation.cpp",
-  ]
+  sources = [ "ExecuteCompilerInvocation.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn
index 2a00a2248bab..727cc5b937dd 100644
--- a/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Testing/BUILD.gn
@@ -4,8 +4,5 @@ static_library("Testing") {
   deps = [
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "CommandLineArgs.cpp",
-  ]
+  sources = [ "CommandLineArgs.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/lib/Tooling/ASTDiff/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Tooling/ASTDiff/BUILD.gn
index e563d444b7dc..3c1d001079a3 100644
--- a/llvm/utils/gn/secondary/clang/lib/Tooling/ASTDiff/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Tooling/ASTDiff/BUILD.gn
@@ -7,8 +7,5 @@ static_library("ASTDiff") {
     "//clang/lib/Lex",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ASTDiff.cpp",
-  ]
+  sources = [ "ASTDiff.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/tools/arcmt-test/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/arcmt-test/BUILD.gn
index 433ab82d08f8..8d7fece1bc02 100644
--- a/llvm/utils/gn/secondary/clang/tools/arcmt-test/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/arcmt-test/BUILD.gn
@@ -7,8 +7,5 @@ executable("arcmt-test") {
     "//clang/lib/Lex",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "arcmt-test.cpp",
-  ]
+  sources = [ "arcmt-test.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/tools/c-arcmt-test/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/c-arcmt-test/BUILD.gn
index d77a8a759db7..a1c8fe10b590 100644
--- a/llvm/utils/gn/secondary/clang/tools/c-arcmt-test/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/c-arcmt-test/BUILD.gn
@@ -1,10 +1,7 @@
 executable("c-arcmt-test") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [ "//clang/tools/libclang" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "c-arcmt-test.c",
-  ]
+  sources = [ "c-arcmt-test.c" ]
 
   # See comment at top of clang/tools/libclang/BUILD.gn for why this isn't
   # needed on Linux.

diff  --git a/llvm/utils/gn/secondary/clang/tools/clang-check/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/clang-check/BUILD.gn
index 4bd97efdc69e..cc2e46dc0bcf 100644
--- a/llvm/utils/gn/secondary/clang/tools/clang-check/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/clang-check/BUILD.gn
@@ -12,8 +12,5 @@ executable("clang-check") {
     "//llvm/lib/Support",
     "//llvm/lib/Target:TargetsToBuild",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangCheck.cpp",
-  ]
+  sources = [ "ClangCheck.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/tools/clang-
diff /BUILD.gn b/llvm/utils/gn/secondary/clang/tools/clang-
diff /BUILD.gn
index 66396992f241..cbf40be649f3 100644
--- a/llvm/utils/gn/secondary/clang/tools/clang-
diff /BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/clang-
diff /BUILD.gn
@@ -7,8 +7,5 @@ executable("clang-
diff ") {
     "//clang/lib/Tooling/ASTDiff",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangDiff.cpp",
-  ]
+  sources = [ "ClangDiff.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/tools/clang-extdef-mapping/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/clang-extdef-mapping/BUILD.gn
index 1fb36e5dae6b..b412840cc979 100644
--- a/llvm/utils/gn/secondary/clang/tools/clang-extdef-mapping/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/clang-extdef-mapping/BUILD.gn
@@ -11,8 +11,5 @@ executable("clang-extdef-mapping") {
     "//llvm/lib/MC",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangExtDefMapGen.cpp",
-  ]
+  sources = [ "ClangExtDefMapGen.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/tools/clang-format/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/clang-format/BUILD.gn
index 63e161898107..55cbb98c7a06 100644
--- a/llvm/utils/gn/secondary/clang/tools/clang-format/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/clang-format/BUILD.gn
@@ -8,8 +8,5 @@ executable("clang-format") {
     "//clang/lib/Tooling/Core",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangFormat.cpp",
-  ]
+  sources = [ "ClangFormat.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/tools/clang-import-test/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/clang-import-test/BUILD.gn
index e169fbd93ca5..dd09384782d7 100644
--- a/llvm/utils/gn/secondary/clang/tools/clang-import-test/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/clang-import-test/BUILD.gn
@@ -11,8 +11,5 @@ executable("clang-import-test") {
     "//llvm/lib/IR",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "clang-import-test.cpp",
-  ]
+  sources = [ "clang-import-test.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/tools/clang-offload-bundler/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/clang-offload-bundler/BUILD.gn
index 25d077ed6383..9cab74691795 100644
--- a/llvm/utils/gn/secondary/clang/tools/clang-offload-bundler/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/clang-offload-bundler/BUILD.gn
@@ -7,8 +7,5 @@ executable("clang-offload-bundler") {
     "//llvm/lib/Object",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangOffloadBundler.cpp",
-  ]
+  sources = [ "ClangOffloadBundler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/tools/clang-offload-wrapper/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/clang-offload-wrapper/BUILD.gn
index 071f2fc518d2..660b223f20d2 100644
--- a/llvm/utils/gn/secondary/clang/tools/clang-offload-wrapper/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/clang-offload-wrapper/BUILD.gn
@@ -7,8 +7,5 @@ executable("clang-offload-wrapper") {
     "//llvm/lib/Support",
     "//llvm/lib/Transforms/Utils",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangOffloadWrapper.cpp",
-  ]
+  sources = [ "ClangOffloadWrapper.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/tools/clang-rename/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/clang-rename/BUILD.gn
index e3f236fe7cef..1c517b989345 100644
--- a/llvm/utils/gn/secondary/clang/tools/clang-rename/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/clang-rename/BUILD.gn
@@ -10,8 +10,5 @@ executable("clang-rename") {
     "//llvm/lib/Option",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangRename.cpp",
-  ]
+  sources = [ "ClangRename.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/tools/clang-scan-deps/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/clang-scan-deps/BUILD.gn
index 2650be873cde..a97d84ec508e 100644
--- a/llvm/utils/gn/secondary/clang/tools/clang-scan-deps/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/clang-scan-deps/BUILD.gn
@@ -15,8 +15,5 @@ executable("clang-scan-deps") {
     "//llvm/lib/IR",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ClangScanDeps.cpp",
-  ]
+  sources = [ "ClangScanDeps.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn
index b8bf5b0373f2..4f87006e0c2b 100644
--- a/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/CrossTU/BUILD.gn
@@ -11,8 +11,5 @@ unittest("CrossTUTests") {
     "//llvm/lib/Support",
     "//llvm/lib/Target:TargetsToBuild",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "CrossTranslationUnitTest.cpp",
-  ]
+  sources = [ "CrossTranslationUnitTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn
index 6060313869a8..60f211ffb88b 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Index/BUILD.gn
@@ -12,8 +12,5 @@ unittest("IndexTests") {
     "//clang/lib/Tooling",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "IndexTests.cpp",
-  ]
+  sources = [ "IndexTests.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
index 242603ae4141..ca29912d2f24 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Serialization/BUILD.gn
@@ -11,8 +11,5 @@ unittest("SerializationTests") {
     "//llvm/lib/Bitcode/Reader",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "InMemoryModuleCacheTest.cpp",
-  ]
+  sources = [ "InMemoryModuleCacheTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn
index 7602c76d67a6..4f6681aba429 100644
--- a/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/libclang/BUILD.gn
@@ -3,10 +3,7 @@ import("//llvm/utils/unittest/unittest.gni")
 unittest("libclangTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [ "//clang/tools/libclang" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "LibclangTest.cpp",
-  ]
+  sources = [ "LibclangTest.cpp" ]
   if (host_os == "mac") {
     ldflags = [ "-Wl,-rpath," + rebase_path("$root_out_dir/lib") ]
   }

diff  --git a/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
index a1525e7acac1..37f277d08d59 100644
--- a/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/libclang/CrashTests/BUILD.gn
@@ -3,10 +3,7 @@ import("//llvm/utils/unittest/unittest.gni")
 unittest("libclangCrashTests") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [ "//clang/tools/libclang" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "LibclangCrashTest.cpp",
-  ]
+  sources = [ "LibclangCrashTest.cpp" ]
   if (host_os == "mac") {
     ldflags = [ "-Wl,-rpath," + rebase_path("$root_out_dir/lib") ]
   }

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn
index b4d1583306a2..1f754d07db37 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/asan/BUILD.gn
@@ -3,10 +3,7 @@ import("//compiler-rt/target.gni")
 source_set("cxx_sources") {
   configs -= [ "//llvm/utils/gn/build:llvm_code" ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "asan_new_delete.cpp",
-  ]
+  sources = [ "asan_new_delete.cpp" ]
 }
 
 if (current_os == "mac") {
@@ -103,10 +100,7 @@ target(asan_target_type, "asan") {
     "asan_win.cpp",
   ]
   if (target_os != "mac" && target_os != "win") {
-    sources += [
-      # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-      "asan_interceptors_vfork.S",
-    ]
+    sources += [ "asan_interceptors_vfork.S" ]
   }
 
   # To be able to include sanitizer_common.

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
index 1291a5d33cbb..e771df5b3e27 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
@@ -173,10 +173,7 @@ static_library("builtins") {
   }
 
   if (current_os != "fuchsia" && !compiler_rt_baremetal_build) {
-    sources += [
-      # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-      "clear_cache.c",
-    ]
+    sources += [ "clear_cache.c" ]
   }
 
   if (current_os == "mac") {
@@ -423,16 +420,9 @@ static_library("builtins") {
   }
 
   if (current_cpu == "arm64") {
-    sources += [
-      # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-      "aarch64/fp_mode.c",
-    ]
+    sources += [ "aarch64/fp_mode.c" ]
     if (current_os == "mingw") {
-      sources += [
-        # Make `gn format` not collapse this, for
-        # sync_source_lists_from_cmake.py.
-        "aarch64/chkstk.S",
-      ]
+      sources += [ "aarch64/chkstk.S" ]
     }
   }
 
@@ -486,11 +476,7 @@ static_library("builtins") {
   }
 
   if (current_cpu == "riscv") {
-    sources += [
-      # This comment prevents `gn format` from putting the file on the same line
-      # as `sources +=`, for sync_source_lists_from_cmake.py.
-      "riscv/mulsi3.S",
-    ]
+    sources += [ "riscv/mulsi3.S" ]
   }
 
   if (current_cpu == "ve") {
@@ -501,11 +487,7 @@ static_library("builtins") {
   }
 
   if (!compiler_rt_exclude_atomic_builtin) {
-    sources += [
-      # This comment prevents `gn format` from putting the file on the same line
-      # as `sources +=`, for sync_source_lists_from_cmake.py.
-      "atomic.c",
-    ]
+    sources += [ "atomic.c" ]
   }
 }
 

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/cfi/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/cfi/BUILD.gn
index 8e34109f89c7..3ff5f3f9a5f9 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/cfi/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/cfi/BUILD.gn
@@ -3,10 +3,7 @@ import("//clang/resource_dir.gni")
 source_set("sources") {
   configs -= [ "//llvm/utils/gn/build:llvm_code" ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "cfi.cpp",
-  ]
+  sources = [ "cfi.cpp" ]
 }
 
 copy("blacklist") {

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
index 5b425a47afdc..75a77622d463 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
@@ -70,10 +70,7 @@ source_set("cxx_sources") {
   configs -= [ "//llvm/utils/gn/build:llvm_code" ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
   deps = [ "//compiler-rt/lib/ubsan:cxx_sources" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "hwasan_new_delete.cpp",
-  ]
+  sources = [ "hwasan_new_delete.cpp" ]
 }
 
 static_library("hwasan") {

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/sanitizer_common/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/sanitizer_common/BUILD.gn
index a4042de7708f..28d8e2da02e5 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/sanitizer_common/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/sanitizer_common/BUILD.gn
@@ -170,8 +170,5 @@ source_set("nolibc_sources") {
   configs -= [ "//llvm/utils/gn/build:llvm_code" ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
   deps = [ "//llvm/utils/gn/build/libs/pthread" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "sanitizer_common_nolibc.cpp",
-  ]
+  sources = [ "sanitizer_common_nolibc.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/BUILD.gn
index 382f5e706638..d6b125a0eb55 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/BUILD.gn
@@ -67,10 +67,7 @@ source_set("c_wrapper_sources") {
   configs -= [ "//llvm/utils/gn/build:llvm_code" ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
   cflags = scudo_cflags
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "wrappers_c.cpp",
-  ]
+  sources = [ "wrappers_c.cpp" ]
 
   public_configs = [ ":scudo_config" ]
 }
@@ -79,10 +76,7 @@ source_set("cxx_wrapper_sources") {
   configs -= [ "//llvm/utils/gn/build:llvm_code" ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
   cflags = scudo_cflags
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "wrappers_cpp.cpp",
-  ]
+  sources = [ "wrappers_cpp.cpp" ]
 
   public_configs = [ ":scudo_config" ]
 }

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn
index d23535ab82d1..879d5a2de863 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn
@@ -1,9 +1,6 @@
 executable("ScudoBenchmarks") {
   configs += [ "//llvm/utils/gn/build:crt_code" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "malloc_benchmark.cpp",
-  ]
+  sources = [ "malloc_benchmark.cpp" ]
   deps = [
     "//compiler-rt/lib/scudo/standalone:sources",
     "//llvm/utils/benchmark",

diff  --git a/llvm/utils/gn/secondary/libcxx/src/BUILD.gn b/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
index 09d850036ad1..6dccffa7aa34 100644
--- a/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
@@ -167,10 +167,7 @@ if (target_os == "win") {
   ]
 }
 if (target_os == "solaris") {
-  cxx_sources += [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "support/solaris/xlocale.cpp",
-  ]
+  cxx_sources += [ "support/solaris/xlocale.cpp" ]
 }
 if (libcxx_enable_filesystem) {
   cxx_sources += [
@@ -179,10 +176,7 @@ if (libcxx_enable_filesystem) {
     "filesystem/operations.cpp",
   ]
   if (libcxx_use_compiler_rt) {
-    cxx_sources += [
-      # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-      "filesystem/int128_builtins.cpp",
-    ]
+    cxx_sources += [ "filesystem/int128_builtins.cpp" ]
   }
 }
 
@@ -268,10 +262,7 @@ if (libcxx_enable_experimental) {
   static_library("cxx_experimental") {
     output_dir = runtimes_dir
     output_name = "c++experimental"
-    sources = [
-      # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-      "experimental/memory_resource.cpp",
-    ]
+    sources = [ "experimental/memory_resource.cpp" ]
     configs += [ ":cxx_config" ]
     configs -= [
       "//llvm/utils/gn/build:no_exceptions",

diff  --git a/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn b/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn
index 8d43581c3669..3e6063a21175 100644
--- a/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn
@@ -52,16 +52,10 @@ if (libcxxabi_enable_exceptions) {
     "cxa_personality.cpp",
   ]
 } else {
-  cxxabi_sources += [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "cxa_noexception.cpp",
-  ]
+  cxxabi_sources += [ "cxa_noexception.cpp" ]
 }
 if (target_os == "linux" || target_os == "fuchsia") {
-  cxxabi_sources += [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "cxa_thread_atexit.cpp",
-  ]
+  cxxabi_sources += [ "cxa_thread_atexit.cpp" ]
 }
 
 config("cxxabi_config") {

diff  --git a/llvm/utils/gn/secondary/libunwind/src/BUILD.gn b/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
index 7aadfff8a6e8..64c9df55a10f 100644
--- a/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
+++ b/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
@@ -44,10 +44,7 @@ unwind_sources = [
   "libunwind_ext.h",
 ]
 if (target_os == "mac") {
-  unwind_sources += [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "Unwind_AppleExtras.cpp",
-  ]
+  unwind_sources += [ "Unwind_AppleExtras.cpp" ]
 }
 
 config("unwind_config") {

diff  --git a/llvm/utils/gn/secondary/lld/MinGW/BUILD.gn b/llvm/utils/gn/secondary/lld/MinGW/BUILD.gn
index 66dbd5642076..c4dca7b00d69 100644
--- a/llvm/utils/gn/secondary/lld/MinGW/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/MinGW/BUILD.gn
@@ -15,8 +15,5 @@ static_library("MinGW") {
     "//llvm/lib/Option",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "Driver.cpp",
-  ]
+  sources = [ "Driver.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn b/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
index a78ea8a57ba3..2f20b57f43ad 100644
--- a/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/lib/Driver/BUILD.gn
@@ -18,8 +18,5 @@ static_library("Driver") {
     "//llvm/lib/Option",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "DarwinLdDriver.cpp",
-  ]
+  sources = [ "DarwinLdDriver.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn b/llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn
index 92c2b9d935af..295a68e652bd 100644
--- a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/lib/ReaderWriter/BUILD.gn
@@ -6,10 +6,7 @@ static_library("ReaderWriter") {
     "//llvm/lib/Object",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "FileArchive.cpp",
-  ]
+  sources = [ "FileArchive.cpp" ]
 
   # FIXME:
   # if (is_msvc) {

diff  --git a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn b/llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn
index 97fe87743ef5..c3339efdd996 100644
--- a/llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/lib/ReaderWriter/YAML/BUILD.gn
@@ -5,8 +5,5 @@ static_library("YAML") {
     "//lld/lib/Core",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ReaderWriterYAML.cpp",
-  ]
+  sources = [ "ReaderWriterYAML.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn b/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
index 746def906f31..f93a44fa634c 100644
--- a/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/tools/lld/BUILD.gn
@@ -33,8 +33,5 @@ executable("lld") {
     "//lld/wasm",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "lld.cpp",
-  ]
+  sources = [ "lld.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn b/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
index 9768c6ffa248..e5cc57e8812f 100644
--- a/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/unittests/DriverTests/BUILD.gn
@@ -6,8 +6,5 @@ unittest("DriverTests") {
     "//lld/lib/Driver",
     "//lld/lib/ReaderWriter/MachO",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "DarwinLdDriverTest.cpp",
-  ]
+  sources = [ "DarwinLdDriverTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Bitstream/Reader/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Bitstream/Reader/BUILD.gn
index 2acb5fcb135f..b300be2ca5c2 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Bitstream/Reader/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Bitstream/Reader/BUILD.gn
@@ -2,8 +2,5 @@ static_library("Reader") {
   output_name = "LLVMBitstreamReader"
   deps = [ "//llvm/lib/Support" ]
 
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "BitstreamReader.cpp",
-  ]
+  sources = [ "BitstreamReader.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/MCJIT/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/MCJIT/BUILD.gn
index 35c7b3b35ec9..7bbf7c18b921 100644
--- a/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/MCJIT/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/ExecutionEngine/MCJIT/BUILD.gn
@@ -8,8 +8,5 @@ static_library("MCJIT") {
     "//llvm/lib/Support",
     "//llvm/lib/Target",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "MCJIT.cpp",
-  ]
+  sources = [ "MCJIT.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Extensions/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Extensions/BUILD.gn
index 7102024b109d..dccbd5c2d530 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Extensions/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Extensions/BUILD.gn
@@ -1,7 +1,4 @@
 static_library("Extensions") {
   output_name = "LLVMExtensions"
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "Extensions.cpp",
-  ]
+  sources = [ "Extensions.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/IRReader/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/IRReader/BUILD.gn
index aa9458638b0b..9667a26094ea 100644
--- a/llvm/utils/gn/secondary/llvm/lib/IRReader/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/IRReader/BUILD.gn
@@ -6,8 +6,5 @@ static_library("IRReader") {
     "//llvm/lib/IR",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "IRReader.cpp",
-  ]
+  sources = [ "IRReader.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/LineEditor/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/LineEditor/BUILD.gn
index 77d80eb055a4..56fa79c7bc66 100644
--- a/llvm/utils/gn/secondary/llvm/lib/LineEditor/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/LineEditor/BUILD.gn
@@ -6,8 +6,5 @@ static_library("LineEditor") {
     "//llvm/utils/gn/build/libs/edit",
   ]
 
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "LineEditor.cpp",
-  ]
+  sources = [ "LineEditor.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/AsmParser/BUILD.gn
index 902fbfa3eedd..604a349cb395 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/AsmParser/BUILD.gn
@@ -21,8 +21,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/AArch64/Utils",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AArch64AsmParser.cpp",
-  ]
+  sources = [ "AArch64AsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/TargetInfo/BUILD.gn
index bfdf408aeecd..11b8c91242d9 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMAArch64Info"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AArch64TargetInfo.cpp",
-  ]
+  sources = [ "AArch64TargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/Utils/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/Utils/BUILD.gn
index 9f199e032ce2..af71879a1ae7 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/Utils/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/Utils/BUILD.gn
@@ -20,8 +20,5 @@ static_library("Utils") {
 
   # AArch64BaseInfo.h includes a header from MCTargetDesc :-/
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AArch64BaseInfo.cpp",
-  ]
+  sources = [ "AArch64BaseInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/AsmParser/BUILD.gn
index d707b2633b82..03b11a2f6fe5 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/AsmParser/BUILD.gn
@@ -18,8 +18,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/AMDGPU/Utils",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AMDGPUAsmParser.cpp",
-  ]
+  sources = [ "AMDGPUAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/Disassembler/BUILD.gn
index fc647321af42..07985dd380e7 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/Disassembler/BUILD.gn
@@ -18,8 +18,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/AMDGPU/Utils",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AMDGPUDisassembler.cpp",
-  ]
+  sources = [ "AMDGPUDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/TargetInfo/BUILD.gn
index 4a53add243ce..985c0ac7838f 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMAMDGPUInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AMDGPUTargetInfo.cpp",
-  ]
+  sources = [ "AMDGPUTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/ARM/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/ARM/AsmParser/BUILD.gn
index 02088e110713..e35f7dee54b1 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/ARM/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/ARM/AsmParser/BUILD.gn
@@ -18,8 +18,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/ARM/Utils",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ARMAsmParser.cpp",
-  ]
+  sources = [ "ARMAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/ARM/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/ARM/Disassembler/BUILD.gn
index 1105625b753e..a8e800531dc2 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/ARM/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/ARM/Disassembler/BUILD.gn
@@ -17,8 +17,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/ARM/Utils",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ARMDisassembler.cpp",
-  ]
+  sources = [ "ARMDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/ARM/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/ARM/TargetInfo/BUILD.gn
index 8e5e8a984453..47ee26d438a4 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/ARM/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/ARM/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMARMInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ARMTargetInfo.cpp",
-  ]
+  sources = [ "ARMTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/ARM/Utils/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/ARM/Utils/BUILD.gn
index 146b63e21720..c9744b84d503 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/ARM/Utils/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/ARM/Utils/BUILD.gn
@@ -21,8 +21,5 @@ static_library("Utils") {
   # ARMBaseInfo.h includes a header from MCTargetDesc,
   # https://reviews.llvm.org/D35209#1075113 :-/
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ARMBaseInfo.cpp",
-  ]
+  sources = [ "ARMBaseInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/AVR/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AVR/AsmParser/BUILD.gn
index 91bf7b61730b..8f37f20be4b1 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AVR/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AVR/AsmParser/BUILD.gn
@@ -17,8 +17,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/AVR/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AVRAsmParser.cpp",
-  ]
+  sources = [ "AVRAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/AVR/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AVR/Disassembler/BUILD.gn
index 8857fb84a094..4f7c3acbc861 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AVR/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AVR/Disassembler/BUILD.gn
@@ -17,8 +17,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/AVR/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AVRDisassembler.cpp",
-  ]
+  sources = [ "AVRDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/AVR/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AVR/TargetInfo/BUILD.gn
index b08046ef011e..eb3ab129112a 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AVR/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AVR/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMAVRInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AVRTargetInfo.cpp",
-  ]
+  sources = [ "AVRTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/BPF/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/BPF/AsmParser/BUILD.gn
index bd8a77cd00e3..a6595ac054cd 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/BPF/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/BPF/AsmParser/BUILD.gn
@@ -17,8 +17,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/BPF/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "BPFAsmParser.cpp",
-  ]
+  sources = [ "BPFAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/BPF/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/BPF/Disassembler/BUILD.gn
index 3f7dc38e858c..f47fe7ac28ce 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/BPF/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/BPF/Disassembler/BUILD.gn
@@ -16,8 +16,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/BPF/MCTargetDesc",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "BPFDisassembler.cpp",
-  ]
+  sources = [ "BPFDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/BPF/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/BPF/TargetInfo/BUILD.gn
index dc87dff47cd3..65022f3ec631 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/BPF/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/BPF/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMBPFInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "BPFTargetInfo.cpp",
-  ]
+  sources = [ "BPFTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/AsmParser/BUILD.gn
index 326f3e53ee99..b4ea8f3e737b 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/AsmParser/BUILD.gn
@@ -16,8 +16,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/Hexagon/MCTargetDesc",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "HexagonAsmParser.cpp",
-  ]
+  sources = [ "HexagonAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/Disassembler/BUILD.gn
index 012ddb28c78c..35a5d86c7e13 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/Disassembler/BUILD.gn
@@ -16,8 +16,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/Hexagon/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "HexagonDisassembler.cpp",
-  ]
+  sources = [ "HexagonDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/TargetInfo/BUILD.gn
index e73540463f68..3fea3a54c822 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Hexagon/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMHexagonInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "HexagonTargetInfo.cpp",
-  ]
+  sources = [ "HexagonTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/AsmParser/BUILD.gn
index 82af0bd42081..72c98631be07 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/AsmParser/BUILD.gn
@@ -16,8 +16,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/Lanai/MCTargetDesc",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "LanaiAsmParser.cpp",
-  ]
+  sources = [ "LanaiAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/Disassembler/BUILD.gn
index 35541f42ea46..3a5ef16b54c7 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/Disassembler/BUILD.gn
@@ -16,8 +16,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/Lanai/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "LanaiDisassembler.cpp",
-  ]
+  sources = [ "LanaiDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/TargetInfo/BUILD.gn
index 0a76709ec725..02fcdcc19f1f 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Lanai/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMLanaiInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "LanaiTargetInfo.cpp",
-  ]
+  sources = [ "LanaiTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Mips/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Mips/AsmParser/BUILD.gn
index 55676914e7f2..35bb2fd4d6e4 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Mips/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Mips/AsmParser/BUILD.gn
@@ -17,8 +17,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/Mips/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "MipsAsmParser.cpp",
-  ]
+  sources = [ "MipsAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Mips/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Mips/Disassembler/BUILD.gn
index 6552a208ce3c..72032cfb7560 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Mips/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Mips/Disassembler/BUILD.gn
@@ -16,8 +16,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/Mips/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "MipsDisassembler.cpp",
-  ]
+  sources = [ "MipsDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Mips/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Mips/TargetInfo/BUILD.gn
index f021ab430ad0..5ee9eb3a8258 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Mips/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Mips/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMMipsInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "MipsTargetInfo.cpp",
-  ]
+  sources = [ "MipsTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/NVPTX/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/NVPTX/TargetInfo/BUILD.gn
index 2f3214851f5a..3c7bf184f761 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/NVPTX/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/NVPTX/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMNVPTXInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "NVPTXTargetInfo.cpp",
-  ]
+  sources = [ "NVPTXTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/AsmParser/BUILD.gn
index a1197f09c67d..250ff3ae11cf 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/AsmParser/BUILD.gn
@@ -17,8 +17,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/PowerPC/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "PPCAsmParser.cpp",
-  ]
+  sources = [ "PPCAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/Disassembler/BUILD.gn
index b8ca1c2c8f81..375b9839fe2a 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/Disassembler/BUILD.gn
@@ -16,8 +16,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/PowerPC/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "PPCDisassembler.cpp",
-  ]
+  sources = [ "PPCDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/TargetInfo/BUILD.gn
index 8dddf52ee4dc..df6ee0ed6754 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/PowerPC/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMPowerPCInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "PowerPCTargetInfo.cpp",
-  ]
+  sources = [ "PowerPCTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/AsmParser/BUILD.gn
index 84e802f67060..5469696c0de3 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/AsmParser/BUILD.gn
@@ -21,8 +21,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/RISCV/Utils",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "RISCVAsmParser.cpp",
-  ]
+  sources = [ "RISCVAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/Disassembler/BUILD.gn
index c0f27d5143e6..09a5a367164a 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/Disassembler/BUILD.gn
@@ -16,8 +16,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/RISCV/Utils",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "RISCVDisassembler.cpp",
-  ]
+  sources = [ "RISCVDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/TargetInfo/BUILD.gn
index f974c8e6df4a..5126400dfaeb 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMRISCVInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "RISCVTargetInfo.cpp",
-  ]
+  sources = [ "RISCVTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/AsmParser/BUILD.gn
index 35d1c68c1405..64d533a6a650 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/AsmParser/BUILD.gn
@@ -16,8 +16,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/Sparc/MCTargetDesc",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "SparcAsmParser.cpp",
-  ]
+  sources = [ "SparcAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/Disassembler/BUILD.gn
index 08c5d3bb64af..f77de6231857 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/Disassembler/BUILD.gn
@@ -15,8 +15,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/Sparc/MCTargetDesc",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "SparcDisassembler.cpp",
-  ]
+  sources = [ "SparcDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/TargetInfo/BUILD.gn
index e5f548180ecf..5a26365fc55a 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/Sparc/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMSparcInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "SparcTargetInfo.cpp",
-  ]
+  sources = [ "SparcTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/AsmParser/BUILD.gn
index 5d4e9b0348ba..5ae08516d032 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/AsmParser/BUILD.gn
@@ -17,8 +17,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/SystemZ/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "SystemZAsmParser.cpp",
-  ]
+  sources = [ "SystemZAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/Disassembler/BUILD.gn
index 69c009b04d42..e2e2513dd881 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/Disassembler/BUILD.gn
@@ -17,8 +17,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/SystemZ/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "SystemZDisassembler.cpp",
-  ]
+  sources = [ "SystemZDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/TargetInfo/BUILD.gn
index 0a17e354015d..56d47868cfb3 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/SystemZ/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMSystemZInfo"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "SystemZTargetInfo.cpp",
-  ]
+  sources = [ "SystemZTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/AsmParser/BUILD.gn
index 43df7fd9eaa1..d7180b52f0f7 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/AsmParser/BUILD.gn
@@ -17,8 +17,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/WebAssembly/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "WebAssemblyAsmParser.cpp",
-  ]
+  sources = [ "WebAssemblyAsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/Disassembler/BUILD.gn
index 40babbb99be0..8a86b67f8ae7 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/Disassembler/BUILD.gn
@@ -17,8 +17,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/WebAssembly/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "WebAssemblyDisassembler.cpp",
-  ]
+  sources = [ "WebAssemblyDisassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/TargetInfo/BUILD.gn
index e2f14c099785..67a207a6c26f 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/WebAssembly/TargetInfo/BUILD.gn
@@ -15,8 +15,5 @@ static_library("TargetInfo") {
   public_deps = [ ":WebAssemblyGenInstrInfo" ]
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "WebAssemblyTargetInfo.cpp",
-  ]
+  sources = [ "WebAssemblyTargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
index 7a33e0cf1ea2..89312a42d881 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
@@ -17,8 +17,5 @@ static_library("AsmParser") {
     "//llvm/lib/Target/X86/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "X86AsmParser.cpp",
-  ]
+  sources = [ "X86AsmParser.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/Disassembler/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/Disassembler/BUILD.gn
index 27d2532c0f04..c311484ab526 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/Disassembler/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/Disassembler/BUILD.gn
@@ -16,8 +16,5 @@ static_library("Disassembler") {
     "//llvm/lib/Target/X86/TargetInfo",
   ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "X86Disassembler.cpp",
-  ]
+  sources = [ "X86Disassembler.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/TargetInfo/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/TargetInfo/BUILD.gn
index 5ab7a55f9a2c..6a502bc0ca1f 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/TargetInfo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/TargetInfo/BUILD.gn
@@ -2,8 +2,5 @@ static_library("TargetInfo") {
   output_name = "LLVMX86Info"
   deps = [ "//llvm/lib/Support" ]
   include_dirs = [ ".." ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "X86TargetInfo.cpp",
-  ]
+  sources = [ "X86TargetInfo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/ToolDrivers/llvm-dlltool/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/ToolDrivers/llvm-dlltool/BUILD.gn
index 0067352f7aff..601aec8d0b46 100644
--- a/llvm/utils/gn/secondary/llvm/lib/ToolDrivers/llvm-dlltool/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/ToolDrivers/llvm-dlltool/BUILD.gn
@@ -13,8 +13,5 @@ static_library("DlltoolDriver") {
     "//llvm/lib/Option",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "DlltoolDriver.cpp",
-  ]
+  sources = [ "DlltoolDriver.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/ToolDrivers/llvm-lib/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/ToolDrivers/llvm-lib/BUILD.gn
index 7f88948e4829..e91588e487b7 100644
--- a/llvm/utils/gn/secondary/llvm/lib/ToolDrivers/llvm-lib/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/ToolDrivers/llvm-lib/BUILD.gn
@@ -15,8 +15,5 @@ static_library("LibDriver") {
     "//llvm/lib/Option",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "LibDriver.cpp",
-  ]
+  sources = [ "LibDriver.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Transforms/CFGuard/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Transforms/CFGuard/BUILD.gn
index 173c55669fef..22d5b8d653aa 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Transforms/CFGuard/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Transforms/CFGuard/BUILD.gn
@@ -4,8 +4,5 @@ static_library("CFGuard") {
     "//llvm/lib/IR",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "CFGuard.cpp",
-  ]
+  sources = [ "CFGuard.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Transforms/Hello/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Transforms/Hello/BUILD.gn
index 06c5c85e4ae1..5ed1019c0933 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Transforms/Hello/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Transforms/Hello/BUILD.gn
@@ -7,10 +7,7 @@ loadable_module("Hello") {
     # needs its headers.
     "//llvm/include/llvm/IR:public_tablegen",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "Hello.cpp",
-  ]
+  sources = [ "Hello.cpp" ]
 
   if (host_os != "mac" && host_os != "win") {
     # The GN build currently doesn't globally pass -fPIC, but that's

diff  --git a/llvm/utils/gn/secondary/llvm/lib/WindowsManifest/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/WindowsManifest/BUILD.gn
index 00f8fbd9d829..3498a0ea539b 100644
--- a/llvm/utils/gn/secondary/llvm/lib/WindowsManifest/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/WindowsManifest/BUILD.gn
@@ -5,8 +5,5 @@ static_library("WindowsManifest") {
     "//llvm/lib/Support",
     "//llvm/utils/gn/build/libs/xml",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "WindowsManifestMerger.cpp",
-  ]
+  sources = [ "WindowsManifestMerger.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/bugpoint-passes/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/bugpoint-passes/BUILD.gn
index 49c2fc81c8f5..f2ead028677a 100644
--- a/llvm/utils/gn/secondary/llvm/tools/bugpoint-passes/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/bugpoint-passes/BUILD.gn
@@ -7,10 +7,7 @@ loadable_module("bugpoint-passes") {
     # needs its headers.
     "//llvm/include/llvm/IR:public_tablegen",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "TestPasses.cpp",
-  ]
+  sources = [ "TestPasses.cpp" ]
 
   if (host_os != "mac" && host_os != "win") {
     # The GN build currently doesn't globally pass -fPIC, but that's

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llc/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llc/BUILD.gn
index f8ef25ef51da..0ec5215434b9 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llc/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llc/BUILD.gn
@@ -15,10 +15,7 @@ executable("llc") {
     "//llvm/lib/Transforms/Utils",
     "//llvm/lib/Transforms/Vectorize",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llc.cpp",
-  ]
+  sources = [ "llc.cpp" ]
 
   # Support plugins.
   # FIXME: Disable dead stripping once other binaries are dead-stripped.

diff  --git a/llvm/utils/gn/secondary/llvm/tools/lli/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/lli/BUILD.gn
index a9af1cf3ca8a..e356479d2d55 100644
--- a/llvm/utils/gn/secondary/llvm/tools/lli/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/lli/BUILD.gn
@@ -19,10 +19,7 @@ executable("lli") {
     "//llvm/lib/Transforms/Instrumentation",
     "//llvm/lib/Transforms/Utils",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "lli.cpp",
-  ]
+  sources = [ "lli.cpp" ]
   if (host_os != "mac" && host_os != "win") {
     # Corresponds to export_executable_symbols() in cmake.
     ldflags = [ "-rdynamic" ]

diff  --git a/llvm/utils/gn/secondary/llvm/tools/lli/ChildTarget/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/lli/ChildTarget/BUILD.gn
index ccea542bd0d8..03bcb5f9838b 100644
--- a/llvm/utils/gn/secondary/llvm/tools/lli/ChildTarget/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/lli/ChildTarget/BUILD.gn
@@ -4,8 +4,5 @@ executable("lli-child-target") {
     "//llvm/lib/ExecutionEngine/RuntimeDyld",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ChildTarget.cpp",
-  ]
+  sources = [ "ChildTarget.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-ar/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-ar/BUILD.gn
index b3d997d5f727..db8c2f09a138 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-ar/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-ar/BUILD.gn
@@ -38,8 +38,5 @@ executable("llvm-ar") {
     "//llvm/lib/ToolDrivers/llvm-dlltool:DlltoolDriver",
     "//llvm/lib/ToolDrivers/llvm-lib:LibDriver",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-ar.cpp",
-  ]
+  sources = [ "llvm-ar.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-as/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-as/BUILD.gn
index 3d2f20b3e114..7433a151f0cf 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-as/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-as/BUILD.gn
@@ -5,8 +5,5 @@ executable("llvm-as") {
     "//llvm/lib/IR",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-as.cpp",
-  ]
+  sources = [ "llvm-as.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-bcanalyzer/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-bcanalyzer/BUILD.gn
index c46350487b63..ab538ef257f8 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-bcanalyzer/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-bcanalyzer/BUILD.gn
@@ -3,8 +3,5 @@ executable("llvm-bcanalyzer") {
     "//llvm/lib/Bitcode/Reader",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-bcanalyzer.cpp",
-  ]
+  sources = [ "llvm-bcanalyzer.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-cat/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-cat/BUILD.gn
index 777eab91c0b4..76cc837ca41f 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-cat/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-cat/BUILD.gn
@@ -6,8 +6,5 @@ executable("llvm-cat") {
     "//llvm/lib/IRReader",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-cat.cpp",
-  ]
+  sources = [ "llvm-cat.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn
index 69d13f1688b9..8e0f2b393c5d 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-cfi-verify/BUILD.gn
@@ -11,8 +11,5 @@ executable("llvm-cfi-verify") {
     "//llvm/lib/Target:AllTargetsDisassemblers",
     "//llvm/lib/Target:AllTargetsInfos",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-cfi-verify.cpp",
-  ]
+  sources = [ "llvm-cfi-verify.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn
index 70c06909c8eb..a9a216d34e48 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn
@@ -359,8 +359,5 @@ executable("llvm-config") {
 
   # To pick up the generated inc files.
   include_dirs = [ "$target_gen_dir" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-config.cpp",
-  ]
+  sources = [ "llvm-config.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-cvtres/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-cvtres/BUILD.gn
index a621bd8b2d04..a4c9afc89ca1 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-cvtres/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-cvtres/BUILD.gn
@@ -12,8 +12,5 @@ executable("llvm-cvtres") {
     "//llvm/lib/Option",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-cvtres.cpp",
-  ]
+  sources = [ "llvm-cvtres.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-cxxfilt/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-cxxfilt/BUILD.gn
index 92ee96d21225..1f419ac99d26 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-cxxfilt/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-cxxfilt/BUILD.gn
@@ -22,8 +22,5 @@ executable("llvm-cxxfilt") {
     "//llvm/lib/Demangle",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-cxxfilt.cpp",
-  ]
+  sources = [ "llvm-cxxfilt.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn
index 577ade68bae1..adcb8171168c 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn
@@ -4,8 +4,5 @@ executable("llvm-cxxmap") {
     "//llvm/lib/Support",
     "//llvm/lib/Target:TargetsToBuild",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-cxxmap.cpp",
-  ]
+  sources = [ "llvm-cxxmap.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-dis/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-dis/BUILD.gn
index 2a047e08f489..691ec912c76b 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-dis/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-dis/BUILD.gn
@@ -4,8 +4,5 @@ executable("llvm-dis") {
     "//llvm/lib/IR",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-dis.cpp",
-  ]
+  sources = [ "llvm-dis.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/BUILD.gn
index 8b8a20d51c6b..b027a6b9f517 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/BUILD.gn
@@ -9,8 +9,5 @@ executable("llvm-exegesis") {
     "//llvm/lib/Support",
     "//llvm/lib/Target:NativeTarget",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-exegesis.cpp",
-  ]
+  sources = [ "llvm-exegesis.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/AArch64/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/AArch64/BUILD.gn
index a9b44c129644..58eea54e5ca0 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/AArch64/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/AArch64/BUILD.gn
@@ -15,9 +15,6 @@ static_library("AArch64") {
     "//llvm/lib/Target/AArch64/MCTargetDesc",
     "//llvm/lib/Target/AArch64/Utils",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "Target.cpp",
-  ]
+  sources = [ "Target.cpp" ]
   include_dirs = [ "//llvm/lib/Target/AArch64" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/Mips/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/Mips/BUILD.gn
index afd32355c9d2..1c4d73949203 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/Mips/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/Mips/BUILD.gn
@@ -14,9 +14,6 @@ static_library("Mips") {
     # depend on these Target/Mips-internal build targets.
     "//llvm/lib/Target/Mips/MCTargetDesc",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "Target.cpp",
-  ]
+  sources = [ "Target.cpp" ]
   include_dirs = [ "//llvm/lib/Target/Mips" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/PowerPC/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/PowerPC/BUILD.gn
index f2d17f07cdc9..dbd0e20fae6c 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/PowerPC/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-exegesis/lib/PowerPC/BUILD.gn
@@ -14,9 +14,6 @@ static_library("PowerPC") {
     # depend on these Target/PowerPC-internal build targets.
     "//llvm/lib/Target/PowerPC/MCTargetDesc",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "Target.cpp",
-  ]
+  sources = [ "Target.cpp" ]
   include_dirs = [ "//llvm/lib/Target/PowerPC" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-extract/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-extract/BUILD.gn
index 7a45704680b6..b486cf0780df 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-extract/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-extract/BUILD.gn
@@ -6,8 +6,5 @@ executable("llvm-extract") {
     "//llvm/lib/Support",
     "//llvm/lib/Transforms/IPO",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-extract.cpp",
-  ]
+  sources = [ "llvm-extract.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-gsymutil/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-gsymutil/BUILD.gn
index 4a35aa0d39a3..f585d59ba566 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-gsymutil/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-gsymutil/BUILD.gn
@@ -7,8 +7,5 @@ executable("llvm-gsymutil") {
     "//llvm/lib/Target",
     "//llvm/lib/Target:TargetsToBuild",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-gsymutil.cpp",
-  ]
+  sources = [ "llvm-gsymutil.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-ifs/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-ifs/BUILD.gn
index 9edd30bda031..66d21241e37e 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-ifs/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-ifs/BUILD.gn
@@ -5,8 +5,5 @@ executable("llvm-ifs") {
     "//llvm/lib/Support",
     "//llvm/lib/TextAPI",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-ifs.cpp",
-  ]
+  sources = [ "llvm-ifs.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-isel-fuzzer/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-isel-fuzzer/BUILD.gn
index 9839b1e7bd04..70aa511666db 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-isel-fuzzer/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-isel-fuzzer/BUILD.gn
@@ -18,8 +18,5 @@ fuzzer("llvm-isel-fuzzer") {
     "//llvm/lib/Transforms/Scalar",
   ]
   dummy_main = "DummyISelFuzzer.cpp"
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-isel-fuzzer.cpp",
-  ]
+  sources = [ "llvm-isel-fuzzer.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-link/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-link/BUILD.gn
index f3f65cc4572c..ac0d3239e2e1 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-link/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-link/BUILD.gn
@@ -10,8 +10,5 @@ executable("llvm-link") {
     "//llvm/lib/Transforms/IPO",
     "//llvm/lib/Transforms/Utils",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-link.cpp",
-  ]
+  sources = [ "llvm-link.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-lipo/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-lipo/BUILD.gn
index e431c00a3cec..3132d2c6d912 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-lipo/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-lipo/BUILD.gn
@@ -13,8 +13,5 @@ executable("llvm-lipo") {
     "//llvm/lib/Support",
     "//llvm/lib/Target:TargetsToBuild",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-lipo.cpp",
-  ]
+  sources = [ "llvm-lipo.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-lto/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-lto/BUILD.gn
index 32ce7a51cd01..ebf42a2adbc2 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-lto/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-lto/BUILD.gn
@@ -11,8 +11,5 @@ executable("llvm-lto") {
     "//llvm/lib/Target",
     "//llvm/lib/Target:TargetsToBuild",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-lto.cpp",
-  ]
+  sources = [ "llvm-lto.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-lto2/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-lto2/BUILD.gn
index 04f215b7d904..0888fb7658b4 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-lto2/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-lto2/BUILD.gn
@@ -10,8 +10,5 @@ executable("llvm-lto2") {
     "//llvm/lib/Target",
     "//llvm/lib/Target:TargetsToBuild",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-lto2.cpp",
-  ]
+  sources = [ "llvm-lto2.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-modextract/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-modextract/BUILD.gn
index be78c93ee64a..8c6df4f6c98e 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-modextract/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-modextract/BUILD.gn
@@ -6,8 +6,5 @@ executable("llvm-modextract") {
     "//llvm/lib/IRReader",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-modextract.cpp",
-  ]
+  sources = [ "llvm-modextract.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-mt/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-mt/BUILD.gn
index cb3e36893071..221637036cec 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-mt/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-mt/BUILD.gn
@@ -12,8 +12,5 @@ executable("llvm-mt") {
     "//llvm/lib/Support",
     "//llvm/lib/WindowsManifest",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-mt.cpp",
-  ]
+  sources = [ "llvm-mt.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-nm/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-nm/BUILD.gn
index 8b6109c87c06..85aa339c8dda 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-nm/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-nm/BUILD.gn
@@ -28,8 +28,5 @@ executable("llvm-nm") {
     "//llvm/lib/Target:AllTargetsDescs",
     "//llvm/lib/Target:AllTargetsInfos",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-nm.cpp",
-  ]
+  sources = [ "llvm-nm.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-opt-fuzzer/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-opt-fuzzer/BUILD.gn
index 9632777de006..0e3e53e2b0d5 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-opt-fuzzer/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-opt-fuzzer/BUILD.gn
@@ -25,8 +25,5 @@ fuzzer("llvm-opt-fuzzer") {
     "//llvm/lib/Transforms/Vectorize",
   ]
   dummy_main = "DummyOptFuzzer.cpp"
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-opt-fuzzer.cpp",
-  ]
+  sources = [ "llvm-opt-fuzzer.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn
index d5465bde1425..1348575c056e 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-opt-report/BUILD.gn
@@ -6,8 +6,5 @@ executable("llvm-opt-report") {
     "//llvm/lib/Remarks",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "OptReport.cpp",
-  ]
+  sources = [ "OptReport.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-profdata/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-profdata/BUILD.gn
index 4284d8820185..df13636e433c 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-profdata/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-profdata/BUILD.gn
@@ -4,8 +4,5 @@ executable("llvm-profdata") {
     "//llvm/lib/ProfileData",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-profdata.cpp",
-  ]
+  sources = [ "llvm-profdata.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-rtdyld/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-rtdyld/BUILD.gn
index 883406866756..7e51367d271f 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-rtdyld/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-rtdyld/BUILD.gn
@@ -8,8 +8,5 @@ executable("llvm-rtdyld") {
     "//llvm/lib/Support",
     "//llvm/lib/Target:TargetsToBuild",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-rtdyld.cpp",
-  ]
+  sources = [ "llvm-rtdyld.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-size/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-size/BUILD.gn
index df444df3f50e..c3e2f30eede1 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-size/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-size/BUILD.gn
@@ -22,8 +22,5 @@ executable("llvm-size") {
     "//llvm/lib/Object",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-size.cpp",
-  ]
+  sources = [ "llvm-size.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-split/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-split/BUILD.gn
index 9d5751241bbf..f37e75aad0a5 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-split/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-split/BUILD.gn
@@ -6,8 +6,5 @@ executable("llvm-split") {
     "//llvm/lib/Support",
     "//llvm/lib/Transforms/Utils",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-split.cpp",
-  ]
+  sources = [ "llvm-split.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-strings/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-strings/BUILD.gn
index 26caa2bea555..c88c72990bca 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-strings/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-strings/BUILD.gn
@@ -23,8 +23,5 @@ executable("llvm-strings") {
     "//llvm/lib/Object",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-strings.cpp",
-  ]
+  sources = [ "llvm-strings.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn
index 1e27efbf44ae..ad7280b9e1fd 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-symbolizer/BUILD.gn
@@ -30,8 +30,5 @@ executable("llvm-symbolizer") {
     "//llvm/lib/Object",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-symbolizer.cpp",
-  ]
+  sources = [ "llvm-symbolizer.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/llvm-undname/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-undname/BUILD.gn
index f8ca57952b1d..97cc65e2e115 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-undname/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-undname/BUILD.gn
@@ -3,8 +3,5 @@ executable("llvm-undname") {
     "//llvm/lib/Demangle",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "llvm-undname.cpp",
-  ]
+  sources = [ "llvm-undname.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
index e802392a717d..82e09a98beca 100644
--- a/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
@@ -11,8 +11,5 @@ executable("sancov") {
     "//llvm/lib/Target:AllTargetsDisassemblers",
     "//llvm/lib/Target:AllTargetsInfos",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "sancov.cpp",
-  ]
+  sources = [ "sancov.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/sanstats/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/sanstats/BUILD.gn
index 2a0f43fb20a6..a43b9a275e24 100644
--- a/llvm/utils/gn/secondary/llvm/tools/sanstats/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/sanstats/BUILD.gn
@@ -3,8 +3,5 @@ executable("sanstats") {
     "//llvm/lib/DebugInfo/Symbolize",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "sanstats.cpp",
-  ]
+  sources = [ "sanstats.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/verify-uselistorder/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/verify-uselistorder/BUILD.gn
index b0c12497e883..92a1f3cd2f52 100644
--- a/llvm/utils/gn/secondary/llvm/tools/verify-uselistorder/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/verify-uselistorder/BUILD.gn
@@ -7,8 +7,5 @@ executable("verify-uselistorder") {
     "//llvm/lib/IRReader",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "verify-uselistorder.cpp",
-  ]
+  sources = [ "verify-uselistorder.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn
index e0b5526b81f4..7e4ba3be0d47 100644
--- a/llvm/utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/yaml2obj/BUILD.gn
@@ -3,8 +3,5 @@ executable("yaml2obj") {
     "//llvm/lib/ObjectYAML",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "yaml2obj.cpp",
-  ]
+  sources = [ "yaml2obj.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn
index c1fb9328bb12..ca576b1ffe32 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/AsmParser/BUILD.gn
@@ -6,8 +6,5 @@ unittest("AsmParserTests") {
     "//llvm/lib/IR",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AsmParserTest.cpp",
-  ]
+  sources = [ "AsmParserTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
index e23c08a2804c..27507406150f 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DebugInfo/GSYM/BUILD.gn
@@ -11,8 +11,5 @@ unittest("DebugInfoGSYMTests") {
     "//llvm/lib/Target:TargetsToBuild",
     "//llvm/lib/Testing/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "GSYMTest.cpp",
-  ]
+  sources = [ "GSYMTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
index eeeea7bba080..095ca3e6b6d0 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/BUILD.gn
@@ -10,8 +10,5 @@ unittest("ExecutionEngineTests") {
     "//llvm/lib/MC",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "ExecutionEngineTest.cpp",
-  ]
+  sources = [ "ExecutionEngineTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
index 23973a599854..4844f3645d44 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/ExecutionEngine/JITLink/BUILD.gn
@@ -9,8 +9,5 @@ unittest("JITLinkTests") {
     "//llvm/lib/Target:TargetsToBuild",
     "//llvm/lib/Testing/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "LinkGraphTests.cpp",
-  ]
+  sources = [ "LinkGraphTests.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn
index eeda1b7fab94..0e69e502ca84 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Frontend/BUILD.gn
@@ -11,8 +11,6 @@ unittest("LLVMFrontendTests") {
   ]
   sources = [
     "OpenMPContextTest.cpp",
-
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
     "OpenMPIRBuilderTest.cpp",
   ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
index 843f54dfca07..f2daa813cb20 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/LineEditor/BUILD.gn
@@ -5,8 +5,5 @@ unittest("LineEditorTests") {
     "//llvm/lib/LineEditor",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "LineEditor.cpp",
-  ]
+  sources = [ "LineEditor.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
index 1b81e98b381a..ab88ae9b495e 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Linker/BUILD.gn
@@ -6,8 +6,5 @@ unittest("LinkerTests") {
     "//llvm/lib/IR",
     "//llvm/lib/Linker",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "LinkModulesTest.cpp",
-  ]
+  sources = [ "LinkModulesTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn
index ccfe716e8ed7..0ddca6569795 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MC/AMDGPU/BUILD.gn
@@ -8,8 +8,5 @@ unittest("AMDGPUDwarfTests") {
     "//llvm/lib/Target/AMDGPU/MCTargetDesc",
     "//llvm/lib/Target/AMDGPU/TargetInfo",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "DwarfRegMappings.cpp",
-  ]
+  sources = [ "DwarfRegMappings.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn
index 1efe9f62c211..6ac92ec49d22 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/MI/BUILD.gn
@@ -10,9 +10,6 @@ unittest("MITests") {
     "//llvm/lib/Target",
     "//llvm/lib/Target:TargetsToBuild",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "LiveIntervalTest.cpp",
-  ]
+  sources = [ "LiveIntervalTest.cpp" ]
   has_custom_main = true
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
index 12b253204fdf..48c90bf63475 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Option/BUILD.gn
@@ -12,8 +12,5 @@ unittest("OptionTests") {
     "//llvm/lib/Option",
     "//llvm/lib/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "OptionParsingTest.cpp",
-  ]
+  sources = [ "OptionParsingTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn
index 93e1cfae1509..fd308a98671d 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Passes/BUILD.gn
@@ -7,10 +7,7 @@ if (host_os != "win") {
     # Put plugin next to the unit test executable.
     output_dir = target_out_dir
 
-    sources = [
-      # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-      "TestPlugin.cpp",
-    ]
+    sources = [ "TestPlugin.cpp" ]
 
     deps = [
       # TestPlugin doesn't want to link in any LLVM code, it just needs its
@@ -35,10 +32,7 @@ unittest("PluginsTests") {
     "//llvm/lib/Support",
     "//llvm/lib/Testing/Support",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "PluginsTest.cpp",
-  ]
+  sources = [ "PluginsTest.cpp" ]
 
   # If plugins are disabled, this test will disable itself at runtime.
   # Otherwise, reconfiguring with plugins disabled will leave behind a stale

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn
index dd5ec5522802..28c0b4b6d3d1 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Support/DynamicLibrary/BUILD.gn
@@ -11,10 +11,7 @@ template("dynlib_add_module") {
     # This assumes that unittest() puts tests in target_out_dir.
     output_dir = target_out_dir
 
-    sources = [
-      # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-      "PipSqueak.cpp",
-    ]
+    sources = [ "PipSqueak.cpp" ]
 
     if (host_os != "mac" && host_os != "win") {
       # The GN build currently doesn't globally pass -fPIC, but that's

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
index 238ff86b771c..592a10a5d1c5 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
@@ -10,8 +10,5 @@ unittest("AMDGPUTests") {
     "//llvm/lib/Target/AMDGPU/Utils",
   ]
   include_dirs = [ "//llvm/lib/Target/AMDGPU" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "DwarfRegMappings.cpp",
-  ]
+  sources = [ "DwarfRegMappings.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn
index 61f49823bb68..fb57c3cce2d1 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/ARM/BUILD.gn
@@ -11,8 +11,5 @@ unittest("ARMTests") {
     "//llvm/lib/Target/ARM/Utils",
   ]
   include_dirs = [ "//llvm/lib/Target/ARM" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "MachineInstrTest.cpp",
-  ]
+  sources = [ "MachineInstrTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn
index f2e3e9754d60..85a15fb58814 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/PowerPC/BUILD.gn
@@ -8,8 +8,5 @@ unittest("PowerPCTests") {
     "//llvm/lib/Target/PowerPC/MCTargetDesc",
     "//llvm/lib/Target/PowerPC/TargetInfo",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AIXRelocModelTest.cpp",
-  ]
+  sources = [ "AIXRelocModelTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn
index 42d08882f78d..e5a3dda94ed4 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/WebAssembly/BUILD.gn
@@ -12,8 +12,5 @@ unittest("WebAssemblyTests") {
     "//llvm/lib/Target/WebAssembly/TargetInfo",
   ]
   include_dirs = [ "//llvm/lib/Target/WebAssembly" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "WebAssemblyExceptionInfoTest.cpp",
-  ]
+  sources = [ "WebAssemblyExceptionInfoTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
index 1f7d412521d6..b181780a971f 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/X86/BUILD.gn
@@ -14,8 +14,5 @@ unittest("X86Tests") {
     "//llvm/lib/Target/X86/TargetInfo",
   ]
   include_dirs = [ "//llvm/lib/Target/X86" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "MachineSizeOptsTest.cpp",
-  ]
+  sources = [ "MachineSizeOptsTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn
index 25550ac4512c..d7a5b0980493 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/AArch64/BUILD.gn
@@ -19,8 +19,5 @@ unittest("LLVMExegesisAArch64Tests") {
     "//llvm/lib/Target/AArch64",
     "//llvm/tools/llvm-exegesis/lib",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "TargetTest.cpp",
-  ]
+  sources = [ "TargetTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn
index e7e6bdd15d16..141b30b174c0 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/tools/llvm-exegesis/ARM/BUILD.gn
@@ -19,8 +19,5 @@ unittest("LLVMExegesisARMTests") {
     "//llvm/lib/Target/ARM",
     "//llvm/tools/llvm-exegesis/lib",
   ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "AssemblerTest.cpp",
-  ]
+  sources = [ "AssemblerTest.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/utils/FileCheck/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/FileCheck/BUILD.gn
index 164ed5dd5c91..08ba9b528e11 100644
--- a/llvm/utils/gn/secondary/llvm/utils/FileCheck/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/FileCheck/BUILD.gn
@@ -1,7 +1,4 @@
 executable("FileCheck") {
   deps = [ "//llvm/lib/Support" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "FileCheck.cpp",
-  ]
+  sources = [ "FileCheck.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/utils/count/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/count/BUILD.gn
index c0844df3def9..347e8b473da7 100644
--- a/llvm/utils/gn/secondary/llvm/utils/count/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/count/BUILD.gn
@@ -1,6 +1,3 @@
 executable("count") {
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "count.c",
-  ]
+  sources = [ "count.c" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/utils/not/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/not/BUILD.gn
index 73f18622c227..59d32013ab74 100644
--- a/llvm/utils/gn/secondary/llvm/utils/not/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/not/BUILD.gn
@@ -1,7 +1,4 @@
 executable("not") {
   deps = [ "//llvm/lib/Support" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "not.cpp",
-  ]
+  sources = [ "not.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn
index 575217cae1f0..66d0dd338d24 100644
--- a/llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/unittest/UnitTestMain/BUILD.gn
@@ -4,10 +4,7 @@ source_set("UnitTestMain") {
   # Make targets depending on this also depend on gtest, to get the gtest
   # include_dir.
   public_deps = [ "..:gtest" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "TestMain.cpp",
-  ]
+  sources = [ "TestMain.cpp" ]
   testonly = true
 }
 

diff  --git a/llvm/utils/gn/secondary/llvm/utils/yaml-bench/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/yaml-bench/BUILD.gn
index 3cbc548d2fba..92c751e4925e 100644
--- a/llvm/utils/gn/secondary/llvm/utils/yaml-bench/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/yaml-bench/BUILD.gn
@@ -1,7 +1,4 @@
 executable("yaml-bench") {
   deps = [ "//llvm/lib/Support" ]
-  sources = [
-    # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
-    "YAMLBench.cpp",
-  ]
+  sources = [ "YAMLBench.cpp" ]
 }


        
