wasm2js: unreachability fixes (#2037)

Also test in pass-debug mode, for better coverage.

2 files changed, 17 insertions, 1 deletions

diff --git a/scripts/test/shared.py b/scripts/test/shared.py
index 14860a74c..8624448d9 100644
--- a/scripts/test/shared.py
+++ b/scripts/test/shared.py
@@ -435,3 +435,17 @@ def minify_check(wast, verify_final_result=True):
 
 def files_with_pattern(*path_pattern):
   return sorted(glob.glob(os.path.join(*path_pattern)))
+
+
+# run a check with BINARYEN_PASS_DEBUG set, to do full validation
+def with_pass_debug(check):
+  old_pass_debug = os.environ.get('BINARYEN_PASS_DEBUG')
+  try:
+    os.environ['BINARYEN_PASS_DEBUG'] = '1'
+    check()
+  finally:
+    if old_pass_debug is not None:
+      os.environ['BINARYEN_PASS_DEBUG'] = old_pass_debug
+    else:
+      if 'BINARYEN_PASS_DEBUG' in os.environ:
+        del os.environ['BINARYEN_PASS_DEBUG']
diff --git a/scripts/test/wasm2js.py b/scripts/test/wasm2js.py
index 1cad83a1b..5b83e1b21 100755
--- a/scripts/test/wasm2js.py
+++ b/scripts/test/wasm2js.py
@@ -19,7 +19,7 @@ import os
 from support import run_command, split_wast
 from shared import (
     WASM2JS, MOZJS, NODEJS, fail_if_not_identical, options, tests,
-    fail_if_not_identical_to_file
+    fail_if_not_identical_to_file, with_pass_debug
 )
 
 # tests with i64s, invokes, etc.
@@ -73,6 +73,8 @@ def test_wasm2js_output():
 
       cmd += ['--allow-asserts']
       out = run_command(cmd)
+      # also verify it passes pass-debug verifications
+      with_pass_debug(lambda: run_command(cmd))
 
       open('a.2asm.asserts.mjs', 'w').write(out)