.

Author: sbc100

emscripten.py

@@ -1598,6 +1598,14 @@ def create_basic_funcs(function_table_sigs, invoke_function_names):
   basic_funcs = shared.Settings.RUNTIME_FUNCS_TO_IMPORT
   if shared.Settings.STACK_OVERFLOW_CHECK and not shared.Settings.MINIMAL_RUNTIME:
     basic_funcs += ['abortStackOverflow']
+  if shared.Settings.SAFE_HEAP:
+    if asm_safe_heap():
+      basic_funcs += ['segfault', 'alignfault', 'ftfault']
+    else:
+      # Binaryen generates calls to these two so they are always needed with wasm
+      if shared.Settings.WASM:
+        basic_funcs += ['segfault', 'alignfault']
+      basic_funcs += ['SAFE_HEAP_LOAD', 'SAFE_HEAP_LOAD_D', 'SAFE_HEAP_STORE', 'SAFE_HEAP_STORE_D', 'SAFE_FT_MASK']
 
   if shared.Settings.ASSERTIONS:
     for sig in function_table_sigs:

tests/test_other.py

@@ -8301,7 +8301,7 @@ def test_single_file(self):
          meminit1_enabled,
          debug_enabled,
          closure_enabled,
-         wasm_enabled) in itertools.product([True, False], repeat=7):
+         wasm_enabled) in itertools.product([True, False], repeat=5):
       # skip unhelpful option combinations
       if wasm_enabled and meminit1_enabled:
         continue
@@ -8310,9 +8310,7 @@ def test_single_file(self):
 
       expect_wasm = wasm_enabled
       expect_meminit = meminit1_enabled and not wasm_enabled
-      expect_success = not single_file_enabled
       expect_wat = debug_enabled and wasm_enabled and not self.is_wasm_backend()
-      should_run_js = expect_success
 
       cmd = [PYTHON, EMCC, path_from_root('tests', 'hello_world.c')]
 
@@ -8330,9 +8328,6 @@ def test_single_file(self):
         cmd += ['-s', 'WASM=0']
 
       self.clear()
-      if not expect_success:
-        self.expect_fail(cmd)
-        continue
 
       def do_test(cmd):
         print(' '.join(cmd))
@@ -8341,8 +8336,7 @@ def do_test(cmd):
         assert expect_meminit == (os.path.exists('a.out.mem') or os.path.exists('a.out.js.mem'))
         assert expect_wasm == os.path.exists('a.out.wasm')
         assert expect_wat == os.path.exists('a.out.wat')
-        if should_run_js:
-          self.assertContained('hello, world!', run_js('a.out.js'))
+        self.assertContained('hello, world!', run_js('a.out.js'))
 
       do_test(cmd)