Re-enable metadce tests (#12401)

sbc100 · web-flow · commit e4ba37c449ef · 2020-10-01T16:26:11.000-07:00
Also remove final reference to __growWasmMemory which
binaryen no longer generates.
diff --git a/src/settings_internal.js b/src/settings_internal.js
@@ -154,7 +154,7 @@ var TARGET_NOT_SUPPORTED = 0x7FFFFFFF;
 // Wasm backend symbols that are considered system symbols and don't
 // have the normal C symbol name mangled applied (== prefix with an underscore)
 // (Also implicily on this list is any function that starts with string "dynCall_")
-var WASM_SYSTEM_EXPORTS = ['setTempRet0', 'getTempRet0', 'stackAlloc', 'stackSave', 'stackRestore', '__growWasmMemory'];
+var WASM_SYSTEM_EXPORTS = ['setTempRet0', 'getTempRet0', 'stackAlloc', 'stackSave', 'stackRestore'];
 
 // Internal: value of -flto argument (either full or thin)
 var LTO = 0;
diff --git a/tests/other/metadce/hello_libcxx_O2.exports b/tests/other/metadce/hello_libcxx_O2.exports
@@ -1,6 +1,5 @@
 __data_end
 __errno_location
-__growWasmMemory
 __indirect_function_table
 __wasm_call_ctors
 dynCall_iiiiiijj
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions.exports b/tests/other/metadce/hello_libcxx_O2_fexceptions.exports
@@ -3,7 +3,6 @@ __cxa_can_catch
 __cxa_is_pointer_type
 __data_end
 __errno_location
-__growWasmMemory
 __indirect_function_table
 __wasm_call_ctors
 dynCall_iiiiiijj
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.exports b/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.exports
@@ -4,7 +4,6 @@ __cxa_demangle
 __cxa_is_pointer_type
 __data_end
 __errno_location
-__growWasmMemory
 __indirect_function_table
 __wasm_call_ctors
 dynCall_iiiiiijj
diff --git a/tests/other/metadce/hello_world.exports b/tests/other/metadce/hello_world.exports
@@ -1,6 +1,5 @@
 __data_end
 __errno_location
-__growWasmMemory
 __indirect_function_table
 __wasm_call_ctors
 dynCall_jiji
diff --git a/tests/other/metadce/hello_world.funcs b/tests/other/metadce/hello_world.funcs
@@ -5,7 +5,6 @@ $__emscripten_stdout_seek
 $__errno_location
 $__fflush_unlocked
 $__fwritex
-$__growWasmMemory
 $__lock
 $__lockfile
 $__lshrti3
diff --git a/tests/other/metadce/hello_world_O1.exports b/tests/other/metadce/hello_world_O1.exports
@@ -1,6 +1,5 @@
 __data_end
 __errno_location
-__growWasmMemory
 __indirect_function_table
 __wasm_call_ctors
 dynCall_jiji
diff --git a/tests/other/metadce/hello_world_O1.funcs b/tests/other/metadce/hello_world_O1.funcs
@@ -2,7 +2,6 @@ $__emscripten_stdout_close
 $__emscripten_stdout_seek
 $__errno_location
 $__fwritex
-$__growWasmMemory
 $__lockfile
 $__original_main
 $__overflow
diff --git a/tests/other/metadce/hello_world_O2.exports b/tests/other/metadce/hello_world_O2.exports
@@ -1,6 +1,5 @@
 __data_end
 __errno_location
-__growWasmMemory
 __indirect_function_table
 __wasm_call_ctors
 dynCall_jiji
diff --git a/tests/other/metadce/hello_world_O2.funcs b/tests/other/metadce/hello_world_O2.funcs
@@ -2,7 +2,6 @@ $__emscripten_stdout_close
 $__emscripten_stdout_seek
 $__errno_location
 $__fwritex
-$__growWasmMemory
 $__overflow
 $__stdio_write
 $__towrite
diff --git a/tests/other/metadce/minimal.exports b/tests/other/metadce/minimal.exports
@@ -1,6 +1,5 @@
 __data_end
 __errno_location
-__growWasmMemory
 __indirect_function_table
 __wasm_call_ctors
 add
diff --git a/tests/other/metadce/minimal.funcs b/tests/other/metadce/minimal.funcs
@@ -1,6 +1,5 @@
 $__errno_location
 $__fflush_unlocked
-$__growWasmMemory
 $__lock
 $__lockfile
 $__ofl_lock
diff --git a/tests/other/metadce/minimal_O1.exports b/tests/other/metadce/minimal_O1.exports
@@ -1,6 +1,5 @@
 __data_end
 __errno_location
-__growWasmMemory
 __indirect_function_table
 __wasm_call_ctors
 add
diff --git a/tests/other/metadce/minimal_O1.funcs b/tests/other/metadce/minimal_O1.funcs
@@ -1,5 +1,4 @@
 $__errno_location
-$__growWasmMemory
 $__wasm_call_ctors
 $add
 $stackAlloc
diff --git a/tests/other/metadce/minimal_O2.exports b/tests/other/metadce/minimal_O2.exports
@@ -1,6 +1,5 @@
 __data_end
 __errno_location
-__growWasmMemory
 __indirect_function_table
 __wasm_call_ctors
 add
diff --git a/tests/other/metadce/minimal_O2.funcs b/tests/other/metadce/minimal_O2.funcs
@@ -1,5 +1,4 @@
 $__errno_location
-$__growWasmMemory
 $__wasm_call_ctors
 $add
 $stackAlloc
diff --git a/tests/other/metadce/minimal_O2.imports b/tests/other/metadce/minimal_O2.imports
@@ -1 +1 @@
-memory
+
diff --git a/tests/test_other.py b/tests/test_other.py
@@ -6650,11 +6650,10 @@ def strip_numeric_suffixes(funcname):
       data = '\n'.join(funcs) + '\n'
       self.assertFileContents(filename, data)
 
-  @disabled("disabled to allow https://github.com/WebAssembly/binaryen/pull/3180 to roll")
   @parameterized({
     'O0': ([],      [], ['waka'],   743), # noqa
-    'O1': (['-O1'], [], ['waka'],   330), # noqa
-    'O2': (['-O2'], [], ['waka'],   312), # noqa
+    'O1': (['-O1'], [], ['waka'],   303), # noqa
+    'O2': (['-O2'], [], ['waka'],   265), # noqa
     # in -O3, -Os and -Oz we metadce, and they shrink it down to the minimal output we want
     'O3': (['-O3'], [], [],          62), # noqa
     'Os': (['-Os'], [], [],          62), # noqa
@@ -6664,7 +6663,6 @@ def strip_numeric_suffixes(funcname):
   def test_metadce_minimal(self, *args):
     self.run_metadce_test('minimal.c', *args)
 
-  @disabled("disabled to allow https://github.com/WebAssembly/binaryen/pull/3180 to roll")
   @parameterized({
     'noexcept': (['-O2'],                    [], ['waka'], 127740), # noqa
     # exceptions increases code size significantly
@@ -6679,7 +6677,6 @@ def test_metadce_cxx(self, *args):
     # lead to different inlining decisions which add or remove a function
     self.run_metadce_test('hello_libcxx.cpp', *args, check_funcs=False)
 
-  @disabled("disabled to allow https://github.com/WebAssembly/binaryen/pull/3180 to roll")
   @parameterized({
     'O0': ([],      [], ['waka'], 12726), # noqa
     'O1': (['-O1'], [], ['waka'],  3511), # noqa

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`$__errno_location`
`2`		`-$__growWasmMemory`
`3`	`2`	`$__wasm_call_ctors`
`4`	`3`	`$add`
`5`	`4`	`$stackAlloc`