Stack trace and heap cleanups (#5988)

* minor cleanups in the js glue code, avoiding redundancy and unnecessary things

* test for assertions notice

Author: kripken

src/postamble.js

@@ -414,18 +414,17 @@ function abort(what) {
   EXITSTATUS = 1;
 
 #if ASSERTIONS == 0
-  var extra = '\nIf this abort() is unexpected, build with -s ASSERTIONS=1 which can give more information.';
+  throw 'abort(' + what + '). Build with -s ASSERTIONS=1 for more info.';
 #else
   var extra = '';
-#endif
-
   var output = 'abort(' + what + ') at ' + stackTrace() + extra;
   if (abortDecorators) {
     abortDecorators.forEach(function(decorator) {
       output = decorator(output, what);
     });
   }
   throw output;
+#endif // ASSERTIONS
 }
 Module['abort'] = abort;
 

src/preamble.js

@@ -1180,6 +1180,7 @@ if (Module['buffer']) {
 #if ASSERTIONS
   assert(buffer.byteLength === TOTAL_MEMORY);
 #endif // ASSERTIONS
+  Module['buffer'] = buffer;
 }
 updateGlobalBufferViews();
 #else // SPLIT_MEMORY
@@ -1474,17 +1475,6 @@ HEAP16[1] = 0x6373;
 if (HEAPU8[2] !== 0x73 || HEAPU8[3] !== 0x63) throw 'Runtime error: expected the system to be little-endian!';
 #endif
 
-Module['HEAP'] = HEAP;
-Module['buffer'] = buffer;
-Module['HEAP8'] = HEAP8;
-Module['HEAP16'] = HEAP16;
-Module['HEAP32'] = HEAP32;
-Module['HEAPU8'] = HEAPU8;
-Module['HEAPU16'] = HEAPU16;
-Module['HEAPU32'] = HEAPU32;
-Module['HEAPF32'] = HEAPF32;
-Module['HEAPF64'] = HEAPF64;
-
 function callRuntimeCallbacks(callbacks) {
   while(callbacks.length > 0) {
     var callback = callbacks.shift();

tests/core/test_demangle_stacks_noassert.cpp

@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+namespace NameSpace {
+class Class {
+ public:
+  __attribute__((noinline))
+  void Aborter(double x, char y, int *z) {
+    volatile int w = 1;
+    if (w) {
+      abort();
+    }
+  }
+};
+}
+
+int main(int argc, char **argv) {
+  NameSpace::Class c;
+  c.Aborter(1.234, 'a', NULL);
+  return 0;
+}

tests/core/test_demangle_stacks_noassert.out

@@ -0,0 +1 @@
+Build with -s ASSERTIONS=1 for more info.

tests/test_core.py

@@ -6085,12 +6085,12 @@ def test(expected, args=[], no_build=False):
     # Kill off the dead function, and check a code path using it aborts
     Settings.DEAD_FUNCTIONS = ['_unused']
     test('*2*')
-    test('abort(-1) at', args=['x'], no_build=True)
+    test('abort(', args=['x'], no_build=True)
 
     # Kill off a library function, check code aborts
     Settings.DEAD_FUNCTIONS = ['_printf']
-    test('abort(-1) at')
-    test('abort(-1) at', args=['x'], no_build=True)
+    test('abort(')
+    test('abort(', args=['x'], no_build=True)
 
   def test_pgo(self):
     if Settings.ASM_JS: return self.skip('PGO does not work in asm mode')
@@ -6338,10 +6338,14 @@ def test_emulate_function_pointer_casts(self):
 
   def test_demangle_stacks(self):
     Settings.DEMANGLE_SUPPORT = 1
+    Settings.ASSERTIONS = 1
     if '-O' in str(self.emcc_args):
       self.emcc_args += ['--profiling-funcs', '--llvm-opts', '0']
-
     self.do_run_in_out_file_test('tests', 'core', 'test_demangle_stacks')
+    if 'ASSERTIONS' not in str(self.emcc_args):
+      print('without assertions, the stack is not printed, but a message suggesting assertions is')
+      Settings.ASSERTIONS = 0
+      self.do_run_in_out_file_test('tests', 'core', 'test_demangle_stacks_noassert')
 
   @no_emterpreter
   @no_wasm_backend('s2wasm does not generate symbol maps')

tests/test_other.py

@@ -764,7 +764,7 @@ def test(args, expected, moar_expected=None):
       if moar_expected: self.assertContained(moar_expected, out)
 
     # fastcomp. all asm, so it can't just work with wrong sigs. but, ASSERTIONS=2 gives much better info to debug
-    test(['-O1'], 'If this abort() is unexpected, build with -s ASSERTIONS=1 which can give more information.') # no useful info, but does mention ASSERTIONS
+    test(['-O1'], 'Build with -s ASSERTIONS=1 for more info.') # no useful info, but does mention ASSERTIONS
     test(['-O1', '-s', 'ASSERTIONS=1'], '''Invalid function pointer called with signature 'v'. Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? Or calling a function with an incorrect type, which will fail? (it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)
 Build with ASSERTIONS=2 for more info.
 ''') # some useful text
@@ -3674,7 +3674,7 @@ def test_bad_function_pointer_cast(self):
                 if opts == 0:
                   assert 'Invalid function pointer called' in output, output
                 else:
-                  assert 'abort()' in output, output
+                  assert 'abort(' in output, output
 
   def test_aliased_func_pointers(self):
     open('src.cpp', 'w').write(r'''