[Bazel] Support for feature debug fission in emsdk-bazel-toolchain emscripten-core#1479

Author: trzeciak

bazel/emscripten_toolchain/wasm_binary.py

@@ -14,7 +14,7 @@
 import argparse
 import os
 import tarfile
-
+import shutil
 
 def ensure(f):
   if not os.path.exists(f):
@@ -26,11 +26,20 @@ def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('--archive', help='The archive to extract from.')
   parser.add_argument('--outputs', help='Comma separated list of files that should be extracted from the archive. Only the extname has to match a file in the archive.')
+  parser.add_argument('--dwp_file', help='Optional dwp input file, generated when fission flags set.')
   parser.add_argument('--allow_empty_outputs', help='If an output listed in --outputs does not exist, create it anyways.', action='store_true')
   args = parser.parse_args()
 
   args.archive = os.path.normpath(args.archive)
   args.outputs = args.outputs.split(",")
+  args.dwp_file = os.path.normpath(args.dwp_file) if args.dwp_file else None
+
+  if args.dwp_file:
+    for idx, output in enumerate(args.outputs):
+      if output.endswith(".dwp"): # also update extension 'binary.dwp' to 'binary.wasm.dwp'
+        shutil.copy2(args.dwp_file, output)
+        args.outputs.pop(idx)
+        break
 
   tar = tarfile.open(args.archive)
 

bazel/emscripten_toolchain/wasm_cc_binary.bzl

@@ -69,6 +69,7 @@ _ALLOW_OUTPUT_EXTNAMES = [
     ".fetch.js",
     ".js.symbols",
     ".wasm.debug.wasm",
+    ".wasm.dwp",
     ".html",
     ".aw.js",
 ]
@@ -107,10 +108,11 @@ _WASM_BINARY_COMMON_ATTRS = {
 }
 
 def _wasm_cc_binary_impl(ctx):
-    args = ctx.actions.args()
     cc_target = ctx.attr.cc_target[0]
+    dwp_file = cc_target[DebugPackageInfo].dwp_file if DebugPackageInfo in cc_target else None
+    outputs = ctx.outputs.outputs
 
-    for output in ctx.outputs.outputs:
+    for output in outputs:
         valid_extname = False
         for allowed_extname in _ALLOW_OUTPUT_EXTNAMES:
             if output.path.endswith(allowed_extname):
@@ -119,21 +121,22 @@ def _wasm_cc_binary_impl(ctx):
         if not valid_extname:
             fail("Invalid output '{}'. Allowed extnames: {}".format(output.basename, ", ".join(_ALLOW_OUTPUT_EXTNAMES)))
 
+    inputs = ctx.files.cc_target
+    args = ctx.actions.args()
     args.add_all("--archive", ctx.files.cc_target)
-    args.add_joined("--outputs", ctx.outputs.outputs, join_with = ",")
+    args.add_joined("--outputs", outputs, join_with = ",")
+
+    if dwp_file:
+        args.add("--dwp_file", dwp_file)
+        inputs = inputs + [dwp_file]
 
     ctx.actions.run(
-        inputs = ctx.files.cc_target,
-        outputs = ctx.outputs.outputs,
+        inputs = inputs,
+        outputs = outputs,
         arguments = [args],
         executable = ctx.executable._wasm_binary_extractor,
     )
 
-    outputs = ctx.outputs.outputs
-    dwp_file = cc_target[DebugPackageInfo].dwp_file if DebugPackageInfo in cc_target else None
-    if dwp_file:
-        outputs = outputs + [dwp_file]
-
     return [
         DefaultInfo(
             files = depset(outputs),
@@ -146,6 +149,7 @@ def _wasm_cc_binary_impl(ctx):
 
 def _wasm_cc_binary_legacy_impl(ctx):
     cc_target = ctx.attr.cc_target[0]
+    dwp_file = cc_target[DebugPackageInfo].dwp_file if DebugPackageInfo in cc_target else None
     outputs = [
         ctx.outputs.loader,
         ctx.outputs.wasm,
@@ -156,26 +160,28 @@ def _wasm_cc_binary_legacy_impl(ctx):
         ctx.outputs.data,
         ctx.outputs.symbols,
         ctx.outputs.dwarf,
+        ctx.outputs.dwp,
         ctx.outputs.html,
         ctx.outputs.audio_worklet,
     ]
 
+    inputs = ctx.files.cc_target
     args = ctx.actions.args()
     args.add("--allow_empty_outputs")
     args.add_all("--archive", ctx.files.cc_target)
     args.add_joined("--outputs", outputs, join_with = ",")
 
+    if dwp_file:
+        args.add("--dwp_file", dwp_file)
+        inputs = inputs + [dwp_file]
+
     ctx.actions.run(
-        inputs = ctx.files.cc_target,
+        inputs = inputs,
         outputs = outputs,
         arguments = [args],
         executable = ctx.executable._wasm_binary_extractor,
     )
 
-    dwp_file = cc_target[DebugPackageInfo].dwp_file if DebugPackageInfo in cc_target else None
-    if dwp_file:
-        outputs = outputs + [dwp_file]
-
     return [
         DefaultInfo(
             executable = ctx.outputs.wasm,
@@ -211,6 +217,7 @@ def _wasm_binary_legacy_outputs(name, cc_target):
         "data": "{}/{}.data".format(name, basename),
         "symbols": "{}/{}.js.symbols".format(name, basename),
         "dwarf": "{}/{}.wasm.debug.wasm".format(name, basename),
+        "dwp": "{}/{}.wasm.dwp".format(name, basename),
         "html": "{}/{}.html".format(name, basename),
         "audio_worklet": "{}/{}.aw.js".format(name, basename)
     }