Fix deletion of DEFAULT_LIBRARY_FUNCS_TO_INCLUDE exports

Author: juj

emcc.py

@@ -1109,6 +1109,12 @@ def get_last_setting_change(setting):
     # Apply -s settings in newargs here (after optimization levels, so they can override them)
     apply_settings(settings_changes)
 
+    if shared.Settings.MINIMAL_RUNTIME or 'MINIMAL_RUNTIME=1' in settings_changes:
+      # Remove the default exported functions 'malloc', 'free', etc. those should only be linked in if used
+      for to_remove in ['malloc', 'free', 'memcpy', 'memset', 'emscripten_get_heap_size']:
+        if to_remove in shared.Settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE:
+          shared.Settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.remove(to_remove)
+
     shared.verify_settings()
 
     def filter_out_dynamic_libs(inputs):
@@ -1249,12 +1255,6 @@ def is_supported_link_flag(f):
 
     link_flags = [f for f in link_flags if is_supported_link_flag(f[1])]
 
-    if shared.Settings.MINIMAL_RUNTIME:
-      # Remove the default exported functions 'malloc', 'free', etc. those should only be linked in if used
-      for to_remove in ['malloc', 'free', 'memcpy', 'memset']:
-        if to_remove in shared.Settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE:
-          shared.Settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.remove(to_remove)
-
     if shared.Settings.STACK_OVERFLOW_CHECK:
       if shared.Settings.MINIMAL_RUNTIME:
         shared.Settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$abortStackOverflow']

src/library.js

@@ -467,7 +467,7 @@ LibraryManager.library = {
   },
 
   emscripten_get_heap_size: function() {
-    return HEAP8.length;
+    return HEAPU8.length;
   },
 
   emscripten_get_sbrk_ptr__asm: true,

tests/test_other.py

@@ -9612,11 +9612,11 @@ def test_minimal_runtime_code_size(self):
       ]
     else:
       test_cases = [
-        (asmjs + opts, hello_world_sources, {'a.html': 1223, 'a.js': 289, 'a.asm.js': 113, 'a.mem': 6}),
-        (opts, hello_world_sources, {'a.html': 1205, 'a.js': 633, 'a.wasm': 86}),
-        (asmjs + opts, hello_webgl_sources, {'a.html': 1353, 'a.js': 4921, 'a.asm.js': 11129, 'a.mem': 321}),
-        (opts, hello_webgl_sources, {'a.html': 1335, 'a.js': 4874, 'a.wasm': 8932}),
-        (opts, hello_webgl2_sources, {'a.html': 1335, 'a.js': 5361, 'a.wasm': 8932}) # Compare how WebGL2 sizes stack up with WebGL 1
+        (asmjs + opts, hello_world_sources, {'a.html': 1222, 'a.js': 289, 'a.asm.js': 113, 'a.mem': 6}),
+        (opts, hello_world_sources, {'a.html': 1204, 'a.js': 630, 'a.wasm': 86}),
+        (asmjs + opts, hello_webgl_sources, {'a.html': 1352, 'a.js': 4896, 'a.asm.js': 11129, 'a.mem': 321}),
+        (opts, hello_webgl_sources, {'a.html': 1334, 'a.js': 4850, 'a.wasm': 8932}),
+        (opts, hello_webgl2_sources, {'a.html': 1334, 'a.js': 5357, 'a.wasm': 8932}) # Compare how WebGL2 sizes stack up with WebGL 1
       ]
 
     success = True