Refactor debug_copy (emscripten-core#9876)

This moves the emscripten.py method of that name, which makes
a copy of the current file to the temp dir, for later debugging, to
shared.py.

It also uses it in run_binaryen_command, to make it easier to
debug.

It also adds an integer counter to the files, so their their order is
clear.

Author: kripken

emscripten.py

@@ -18,7 +18,6 @@
 import re
 import time
 import logging
-import shutil
 import pprint
 from collections import OrderedDict
 
@@ -2275,21 +2274,17 @@ def remove_trailing_zeros(memfile):
 
 
 def finalize_wasm(temp_files, infile, outfile, memfile, DEBUG):
-  def debug_copy(src, dst):
-    if DEBUG:
-      shutil.copyfile(src, os.path.join(shared.CANONICAL_TEMP_DIR, dst))
-
   basename = shared.unsuffixed(outfile.name)
   wasm = basename + '.wasm'
   base_wasm = infile
-  debug_copy(infile, 'base.wasm')
+  shared.Building.debug_copy(infile, 'base.wasm')
 
   args = ['--detect-features']
 
   write_source_map = shared.Settings.DEBUG_LEVEL >= 4
   if write_source_map:
     shared.Building.emit_wasm_source_map(base_wasm, base_wasm + '.map')
-    debug_copy(base_wasm + '.map', 'base_wasm.map')
+    shared.Building.debug_copy(base_wasm + '.map', 'base_wasm.map')
     args += ['--output-source-map-url=' + shared.Settings.SOURCE_MAP_BASE + os.path.basename(shared.Settings.WASM_BINARY_FILE) + '.map']
 
   # tell binaryen to look at the features section, and if there isn't one, to use MVP
@@ -2329,8 +2324,8 @@ def debug_copy(src, dst):
                                                 args=args,
                                                 stdout=subprocess.PIPE)
   if write_source_map:
-    debug_copy(wasm + '.map', 'post_finalize.map')
-  debug_copy(wasm, 'post_finalize.wasm')
+    shared.Building.debug_copy(wasm + '.map', 'post_finalize.map')
+  shared.Building.debug_copy(wasm, 'post_finalize.wasm')
 
   if not shared.Settings.MEM_INIT_IN_WASM:
     # we have a separate .mem file. binaryen did not strip any trailing zeros,

tools/shared.py

@@ -2913,12 +2913,23 @@ def run_binaryen_command(tool, infile, outfile=None, args=[], debug=False, stdou
       # that info in the map anyhow
       cmd += ['--strip-dwarf']
 
-    return run_process(cmd, stdout=stdout).stdout
+    ret = run_process(cmd, stdout=stdout).stdout
+    if outfile:
+      Building.debug_copy(outfile, '%s.wasm' % tool)
+    return ret
 
   @staticmethod
   def run_wasm_opt(*args, **kwargs):
     return Building.run_binaryen_command('wasm-opt', *args, **kwargs)
 
+  debug_copy_counter = 0
+
+  @staticmethod
+  def debug_copy(src, dst):
+    if DEBUG:
+      shutil.copyfile(src, os.path.join(CANONICAL_TEMP_DIR, 'emdebug-%d-%s' % (Building.debug_copy_counter, dst)))
+      Building.debug_copy_counter += 1
+
 
 # compatibility with existing emcc, etc. scripts
 Cache = cache.Cache()