Merge pull request #35888 from lorentey/split-cmdline-improvements

[utils] split-cmdline: Handle typical compiler invocations better

Author: lorentey

utils/dev-scripts/split-cmdline

@@ -78,50 +78,47 @@ def main():
 
             # A hard-coded list of options which expect a parameter
             is_arg_param = arg in [
-                "-o",
-                "-target",
-                "-isysroot",
-                "-emit-sil",
-                "-emit-ir",
-                "-module-name",
-                "-framework",
-                "-Xlinker",
-                "-arch",
+                "--sdk",
+                "--toolchain",
                 "-D",
-                "-sdk",
-                "-module-cache-path",
                 "-F",
-                "-output-file-map",
-                "-emit-module-path",
-                "-Xcc",
                 "-I",
-                "-iquote",
-                "-emit-objc-header-path",
-                "-Xfrontend",
-                "-filelist",
-                "-num-threads",
-                "-Xclang",
-                "-x",
                 "-L",
-                "-rpath",
-                "-macosx_version_min",
-                "-syslibroot",
+                "-Xcc",
+                "-Xclang",
+                "-Xfrontend",
+                "-Xlinker",
+                "-Xllvm",
                 "-add_ast_path",
+                "-arch",
+                "-emit-ir",
+                "-emit-sil",
+                "-filelist",
+                "-fileno",
+                "-framework",
                 "-import-objc-header",
-                "-serialize-diagnostics-path",
-                "-emit-dependencies-path",
-                "-emit-reference-dependencies-path",
+                "-iquote",
+                "-isysroot",
+                "-macosx_version_min",
+                "-module-link-name",
+                "-module-name",
+                "-num-threads",
+                "-o",
+                "-output-file-map",
                 "-primary-file",
                 "-resource-dir",
-                "--sdk",
-                "--toolchain",
-                "-emit-module-doc-path",
-                "-module-link-name",
-                "-group-info-path",
-                "-fileno",
+                "-rpath",
+                "-sdk",
                 "-swift-version",
-                "-Xllvm",
+                "-syslibroot",
+                "-target",
+                "-target-sdk-version",
+                "-working-directory",
+                "-x",
             ]
+            # Heuristic: options ending in -path expect an argument
+            if arg.startswith("-") and arg.endswith("-path"):
+                is_arg_param = True
 
         # Print 2 new lines after each command line
         print("\n")