Fix wasm2s (SAFE_HEAP) test suite

This change fixes all the failing tests in the wasm2s suite.

Depends on WebAssembly/binaryen#4439.

Author: sbc100

emcc.py

@@ -1438,7 +1438,9 @@ def default_setting(name, new_default):
     if name not in settings_map:
       setattr(settings, name, new_default)
 
-  if settings.OPT_LEVEL >= 1:
+  if settings.SAFE_HEAP >= 1:
+    default_setting('ASSERTIONS', 1)
+  elif settings.OPT_LEVEL >= 1:
     default_setting('ASSERTIONS', 0)
   if settings.SHRINK_LEVEL >= 2:
     default_setting('EVAL_CTORS', 1)
@@ -1954,6 +1956,8 @@ def default_setting(name, new_default):
     # SAFE_HEAP check includes calling emscripten_get_sbrk_ptr() from wasm
     settings.REQUIRED_EXPORTS += ['emscripten_get_sbrk_ptr', 'emscripten_stack_get_base']
     settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$unSign']
+    if not settings.ASSERTIONS:
+      exit_with_error('SAFE_HEAP requires ASSERTIONS to be enabled')
 
   if not settings.DECLARE_ASM_MODULE_EXPORTS:
     settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$exportAsmFunctions']

src/runtime_safe_heap.js

@@ -110,7 +110,7 @@ function SAFE_HEAP_STORE(dest, value, bytes, isFloat) {
 #else
   if (dest % bytes !== 0) warnOnce('alignment error in a memory store operation, alignment was a multiple of ' + (((dest ^ (dest-1)) >> 1) + 1) + ', but was was expected to be aligned to a multiple of ' + bytes);
 #endif
-  if (runtimeInitialized) {
+  if (runtimeInitialized && !runtimeExited) {
     var brk = _sbrk() >>> 0;
     if (dest + bytes > brk) abort('segmentation fault, exceeded the top of the available dynamic heap when storing ' + bytes + ' bytes to address ' + dest + '. DYNAMICTOP=' + brk);
     assert(brk >= _emscripten_stack_get_base()); // sbrk-managed memory must be above the stack
@@ -134,7 +134,7 @@ function SAFE_HEAP_LOAD(dest, bytes, unsigned, isFloat) {
 #else
   if (dest % bytes !== 0) warnOnce('alignment error in a memory load operation, alignment was a multiple of ' + (((dest ^ (dest-1)) >> 1) + 1) + ', but was was expected to be aligned to a multiple of ' + bytes);
 #endif
-  if (runtimeInitialized) {
+  if (runtimeInitialized && !runtimeExited) {
     var brk = _sbrk() >>> 0;
     if (dest + bytes > brk) abort('segmentation fault, exceeded the top of the available dynamic heap when loading ' + bytes + ' bytes from address ' + dest + '. DYNAMICTOP=' + brk);
     assert(brk >= _emscripten_stack_get_base()); // sbrk-managed memory must be above the stack

src/shell.js

@@ -450,7 +450,9 @@ assert(typeof Module['TOTAL_MEMORY'] === 'undefined', 'Module.TOTAL_MEMORY has b
 {{{ makeRemovedFSAssert('IDBFS') }}}
 {{{ makeRemovedFSAssert('PROXYFS') }}}
 {{{ makeRemovedFSAssert('WORKERFS') }}}
+#if !NODERAWFS
 {{{ makeRemovedFSAssert('NODEFS') }}}
+#endif
 {{{ makeRemovedRuntimeFunction('alignMemory') }}}
 
 #if USE_PTHREADS

system/lib/sbrk.c

@@ -96,7 +96,9 @@ void *sbrk(intptr_t increment_) {
 #endif // __EMSCRIPTEN_PTHREADS__
 
 #ifdef __EMSCRIPTEN_TRACING__
-    EM_ASM({if (typeof emscriptenMemoryProfiler !== 'undefined') emscriptenMemoryProfiler.onSbrkGrow($0, $1)}, old_brk, old_brk + increment );
+    if (increment) {
+      EM_ASM({if (typeof emscriptenMemoryProfiler !== 'undefined') emscriptenMemoryProfiler.onSbrkGrow($0, $1)}, old_brk, old_brk + increment );
+    }
 #endif
     return (void*)old_brk;
 

tests/test_core.py

@@ -2297,6 +2297,7 @@ def test_varargs_byval(self):
 The current type of b is: 9
 ''')
 
+  @no_safe_heap('musls fcntl seems to contain an invalid read')
   def test_functionpointer_libfunc_varargs(self):
     self.do_core_test('test_functionpointer_libfunc_varargs.c')
 
@@ -6512,6 +6513,7 @@ def test_dyncall_specific(self, *args):
       print(str(args) + ' ' + which)
       self.do_core_test('dyncall_specific.c', emcc_args=['-D' + which] + list(args) + extra_args)
 
+  @no_safe_heap('SAFE_HEAP is not compatible with ASSERTIONS=0')
   def test_getValue_setValue(self):
     # these used to be exported, but no longer are by default
     def test(output_prefix='', args=[], assert_returncode=0):
@@ -6535,6 +6537,7 @@ def test(output_prefix='', args=[], assert_returncode=0):
     '': ([],),
     '_files': (['-DUSE_FILES'],)
   })
+  @no_safe_heap('SAFE_HEAP is not compatible with ASSERTIONS=0')
   def test_FS_exports(self, extra_args):
     # these used to be exported, but no longer are by default
     def test(output_prefix='', args=[], assert_returncode=0):
@@ -6557,6 +6560,7 @@ def test(output_prefix='', args=[], assert_returncode=0):
     self.set_setting('EXPORTED_RUNTIME_METHODS', ['FS_createDataFile'])
     test(args=['-s', 'FORCE_FILESYSTEM'])
 
+  @no_safe_heap('SAFE_HEAP is not compatible with ASSERTIONS=0')
   def test_legacy_exported_runtime_numbers(self):
     # these used to be exported, but no longer are by default
     def test(output_prefix='', args=[], assert_returncode=0):
@@ -6717,6 +6721,7 @@ def test_emulate_function_pointer_casts(self):
     self.do_core_test('test_emulate_function_pointer_casts.cpp')
 
   @no_wasm2js('TODO: nicely printed names in wasm2js')
+  @no_safe_heap('SAFE_HEAP is not compatible with ASSERTIONS=0')
   @parameterized({
     'normal': ([],),
     'noexcept': (['-fno-exceptions'],)
@@ -7881,13 +7886,11 @@ def test_memprof_requirements(self):
     # This test checks for the global variables required to run the memory
     # profiler.  It would fail if these variables were made no longer global
     # or if their identifiers were changed.
-    create_file('main.cpp', '''
-      extern "C" {
-        void check_memprof_requirements();
-      }
+    create_file('main.c', '''
+      int check_memprof_requirements();
+
       int main() {
-        check_memprof_requirements();
-        return 0;
+        return check_memprof_requirements();
       }
     ''')
     create_file('lib.js', '''
@@ -7898,14 +7901,16 @@ def test_memprof_requirements(self):
               typeof _emscripten_stack_get_current === 'function' &&
               typeof Module['___heap_base'] === 'number') {
              out('able to run memprof');
+             return 0;
            } else {
              out('missing the required variables to run memprof');
+             return 1;
            }
         }
       });
     ''')
     self.emcc_args += ['--memoryprofiler', '--js-library', 'lib.js']
-    self.do_runf('main.cpp', 'able to run memprof')
+    self.do_runf('main.c', 'able to run memprof')
 
   def test_fs_dict(self):
     self.set_setting('FORCE_FILESYSTEM')