[Parsable Output] Code-review feedback: Display identical batch-mode command line for all constituent messages

This will make it easier to debug the compiler by taking build command line commands from the build log.

Author: artemcm

Sources/SwiftDriver/Driver/ToolExecutionDelegate.swift

@@ -199,9 +199,7 @@ private extension ToolExecutionDelegate {
       result.append(
         constructSingleBeganMessage(inputs: [input],
                                     outputs: outputPaths,
-                                    arguments: Self.filterPrimaryArguments(in: arguments,
-                                                                           input: input,
-                                                                           outputs: outputPaths),
+                                    arguments: arguments,
                                     pid: quasiPID,
                                     realPid: pid))
       // Save the quasiPID of this job/input combination in order to generate the correct
@@ -300,44 +298,6 @@ private extension ToolExecutionDelegate {
     return SignalledMessage(pid: pid, realPid: realPid, output: output,
                             errorMessage: error, signal: Int(signal))
   }
-
-  /// Best-effort attempt to "fix-up" the individual swift-frontend invocation command line, to pretend
-  /// it is an individual single-primary compile job, rather than a batch mode compile with multiple primaries
-  static func filterPrimaryArguments(in arguments: [String],
-                                             input: TypedVirtualPath,
-                                             outputs: [TypedVirtualPath]) -> [String] {
-    // We must have only one `-primary-file` option specified, the one that corresponds
-    // to the primary file whose job this message is faking.
-    var result = arguments.enumerated().compactMap() { index, element -> String? in
-      if element == "-primary-file" {
-        assert(arguments.count > index + 1)
-        return arguments[index + 1].hasSuffix(input.file.basename) ? element : nil
-      }
-      return element
-    }
-
-    // We must have only one `-o` option specified, the one that corresponds
-    // to the primary output file for the current input, whose job this message is faking.
-    let outputPathStrings = outputs.map { $0.file.description }
-    var pathsToRemove : [String] = []
-    result = result.enumerated().compactMap() { index, element -> String? in
-      if element == "-o" {
-        assert(result.count > index + 1)
-        if outputPathStrings.contains(result[index + 1]) {
-          return element
-        } else {
-          pathsToRemove.append(result[index + 1])
-          return nil
-        }
-      }
-      if pathsToRemove.contains(element) {
-        return nil
-      }
-      return element
-    }
-
-    return result
-  }
 }
 
 fileprivate extension Diagnostic.Message {

Tests/SwiftDriverTests/ParsableMessageTests.swift

@@ -150,13 +150,6 @@ final class ParsableMessageTests: XCTestCase {
 
           /// One per primary
           XCTAssertTrue(errorOutput.contains(
-          """
-              \"-primary-file\",
-              \"\\/WorkDir\\/main.swift\",
-              \"\\/WorkDir\\/test1.swift\",
-              \"\\/WorkDir\\/test2.swift\",
-          """))
-          XCTAssertTrue(errorOutput.contains(
           """
             "pid" : -1000,
           """))
@@ -167,13 +160,6 @@ final class ParsableMessageTests: XCTestCase {
             ],
           """))
           XCTAssertTrue(errorOutput.contains(
-          """
-              \"\\/WorkDir\\/main.swift\",
-              \"-primary-file\",
-              \"\\/WorkDir\\/test1.swift\",
-              \"\\/WorkDir\\/test2.swift\",
-          """))
-          XCTAssertTrue(errorOutput.contains(
           """
             "pid" : -1001,
           """))
@@ -184,13 +170,6 @@ final class ParsableMessageTests: XCTestCase {
             ],
           """))
           XCTAssertTrue(errorOutput.contains(
-          """
-              \"\\/WorkDir\\/main.swift\",
-              \"\\/WorkDir\\/test1.swift\",
-              \"-primary-file\",
-              \"\\/WorkDir\\/test2.swift\",
-          """))
-          XCTAssertTrue(errorOutput.contains(
           """
             "pid" : -1002,
           """))