Remove --split-debug mode

The split-out DWARF can't be used anyway because wasm-opt invalidates it
during optimization.

Author: kateinoigakukun

Plugins/PackageToJS/Sources/PackageToJS.swift

@@ -17,8 +17,6 @@ struct PackageToJS {
     struct BuildOptions {
         /// Product to build (default: executable target if there's only one)
         var product: String?
-        /// Whether to split debug information into a separate file (default: false)
-        var splitDebug: Bool
         /// Whether to apply wasm-opt optimizations in release mode (default: true)
         var noOptimize: Bool
         /// The options for packaging
@@ -390,7 +388,7 @@ struct PackagingPlanner {
         buildOptions: PackageToJS.BuildOptions
     ) throws -> MiniMake.TaskKey {
         let (allTasks, _, _, _) = try planBuildInternal(
-            make: &make, splitDebug: buildOptions.splitDebug, noOptimize: buildOptions.noOptimize
+            make: &make, noOptimize: buildOptions.noOptimize
         )
         return make.addTask(
             inputTasks: allTasks, output: BuildPath(phony: "all"), attributes: [.phony, .silent]
@@ -399,7 +397,7 @@ struct PackagingPlanner {
 
     private func planBuildInternal(
         make: inout MiniMake,
-        splitDebug: Bool, noOptimize: Bool
+        noOptimize: Bool
     ) throws -> (
         allTasks: [MiniMake.TaskKey],
         outputDirTask: MiniMake.TaskKey,
@@ -435,25 +433,23 @@ struct PackagingPlanner {
 
         if shouldOptimize {
             // Optimize the wasm in release mode
-            // If splitDebug is true, we need to place the DWARF-stripped wasm file (but "name" section remains)
-            // in the output directory.
-            let stripWasmPath = (splitDebug ? outputDir : intermediatesDir).appending(path: wasmFilename + ".debug")
+            let wasmWithoutDwarfPath = intermediatesDir.appending(path: wasmFilename + ".no-dwarf")
 
             // First, strip DWARF sections as their existence enables DWARF preserving mode in wasm-opt
-            let stripWasm = make.addTask(
+            let wasmWithoutDwarf = make.addTask(
                 inputFiles: [selfPath, wasmProductArtifact], inputTasks: [outputDirTask, intermediatesDirTask],
-                output: stripWasmPath
+                output: wasmWithoutDwarfPath
             ) {
                 print("Stripping DWARF debug info...")
                 try system.wasmOpt(["--strip-dwarf", "--debuginfo"], input: $1.resolve(path: wasmProductArtifact).path, output: $1.resolve(path: $0.output).path)
             }
             // Then, run wasm-opt with all optimizations
             wasm = make.addTask(
-                inputFiles: [selfPath, stripWasmPath], inputTasks: [outputDirTask, stripWasm],
+                inputFiles: [selfPath, wasmWithoutDwarfPath], inputTasks: [outputDirTask, wasmWithoutDwarf],
                 output: finalWasmPath
             ) {
                 print("Optimizing the wasm file...")
-                try system.wasmOpt(["-Os"], input: $1.resolve(path: stripWasmPath).path, output: $1.resolve(path: $0.output).path)
+                try system.wasmOpt(["-Os", "--debuginfo"], input: $1.resolve(path: wasmWithoutDwarfPath).path, output: $1.resolve(path: $0.output).path)
             }
         } else {
             // Copy the wasm product artifact
@@ -522,7 +518,7 @@ struct PackagingPlanner {
         make: inout MiniMake
     ) throws -> (rootTask: MiniMake.TaskKey, binDir: BuildPath) {
         var (allTasks, outputDirTask, intermediatesDirTask, packageJsonTask) = try planBuildInternal(
-            make: &make, splitDebug: false, noOptimize: false
+            make: &make, noOptimize: false
         )
 
         // Install npm dependencies used in the test harness

Plugins/PackageToJS/Sources/PackageToJSPlugin.swift

@@ -294,10 +294,9 @@ extension PackageToJS.PackageOptions {
 extension PackageToJS.BuildOptions {
     static func parse(from extractor: inout ArgumentExtractor) -> PackageToJS.BuildOptions {
         let product = extractor.extractOption(named: "product").last
-        let splitDebug = extractor.extractFlag(named: "split-debug")
         let noOptimize = extractor.extractFlag(named: "no-optimize")
         let packageOptions = PackageToJS.PackageOptions.parse(from: &extractor)
-        return PackageToJS.BuildOptions(product: product, splitDebug: splitDebug != 0, noOptimize: noOptimize != 0, packageOptions: packageOptions)
+        return PackageToJS.BuildOptions(product: product, noOptimize: noOptimize != 0, packageOptions: packageOptions)
     }
 
     static func help() -> String {
@@ -311,7 +310,6 @@ extension PackageToJS.BuildOptions {
               --output <path>        Path to the output directory (default: .build/plugins/PackageToJS/outputs/Package)
               --package-name <name>  Name of the package (default: lowercased Package.swift name)
               --explain              Whether to explain the build plan (default: false)
-              --split-debug          Whether to split debug information into a separate .wasm.debug file (default: false)
               --no-optimize          Whether to disable wasm-opt optimization (default: false)
               --use-cdn              Whether to use CDN for dependency packages (default: false)
               --enable-code-coverage Whether to enable code coverage collection (default: false)

Plugins/PackageToJS/Tests/PackagingPlannerTests.swift

@@ -35,12 +35,11 @@ import Testing
     }
 
     @Test(arguments: [
-        (variant: "debug", configuration: "debug", splitDebug: false, noOptimize: false),
-        (variant: "release", configuration: "release", splitDebug: false, noOptimize: false),
-        (variant: "release_split_debug", configuration: "release", splitDebug: true, noOptimize: false),
-        (variant: "release_no_optimize", configuration: "release", splitDebug: false, noOptimize: true),
+        (variant: "debug", configuration: "debug", noOptimize: false),
+        (variant: "release", configuration: "release", noOptimize: false),
+        (variant: "release_no_optimize", configuration: "release", noOptimize: true),
     ])
-    func planBuild(variant: String, configuration: String, splitDebug: Bool, noOptimize: Bool) throws {
+    func planBuild(variant: String, configuration: String, noOptimize: Bool) throws {
         let options = PackageToJS.PackageOptions()
         let system = TestPackagingSystem()
         let planner = PackagingPlanner(
@@ -60,7 +59,6 @@ import Testing
                 make: &make,
                 buildOptions: PackageToJS.BuildOptions(
                     product: "test",
-                    splitDebug: splitDebug,
                     noOptimize: noOptimize,
                     packageOptions: options
                 )

Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json

@@ -19,7 +19,7 @@
       "$PLANNER_SOURCE_PATH",
       "$WASM_PRODUCT_ARTIFACT"
     ],
-    "output" : "$INTERMEDIATES\/main.wasm.debug",
+    "output" : "$INTERMEDIATES\/main.wasm.no-dwarf",
     "wants" : [
       "$OUTPUT",
       "$INTERMEDIATES"
@@ -126,12 +126,12 @@
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
-      "$INTERMEDIATES\/main.wasm.debug"
+      "$INTERMEDIATES\/main.wasm.no-dwarf"
     ],
     "output" : "$OUTPUT\/main.wasm",
     "wants" : [
       "$OUTPUT",
-      "$INTERMEDIATES\/main.wasm.debug"
+      "$INTERMEDIATES\/main.wasm.no-dwarf"
     ]
   },
   {