Use Binaryen's new --inline-main pass, to inline __original_main into main (emscripten-core#9888)

Author: kripken

emcc.py

@@ -1671,6 +1671,9 @@ def parse_passes(string):
           if shared.Settings.SAFE_HEAP:
             passes += ['--safe-heap']
           passes += ['--post-emscripten']
+          # always inline __original_main into main, as otherwise it makes debugging confusing,
+          # and doing so is never bad for code size
+          passes += ['--inline-main']
           if not shared.Settings.EXIT_RUNTIME:
             passes += ['--no-exit-runtime']
           if options.opt_level > 0 or options.shrink_level > 0:

tests/other/metadce/hello_world_O1.funcs

@@ -4,7 +4,6 @@ $__errno_location
 $__fwritex
 $__growWasmMemory
 $__lockfile
-$__original_main
 $__overflow
 $__stdio_write
 $__towrite

tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM.funcs

@@ -1,4 +1,3 @@
-$__original_main
 $_start
 $dlmalloc
 $main

tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM_flto.funcs

@@ -1,4 +1,3 @@
-$__original_main
 $_start
 $dlmalloc
 $main

tests/test_other.py

@@ -8187,7 +8187,7 @@ def test_metadce_cxx_fastcomp(self, *args):
 
   @parameterized({
     'O0': ([],       9, [], ['waka'], 22185,  8,  17, 57), # noqa
-    'O1': (['-O1'],  7, [], ['waka'], 10415,  6,  14, 31), # noqa
+    'O1': (['-O1'],  7, [], ['waka'], 10415,  6,  14, 30), # noqa
     'O2': (['-O2'],  7, [], ['waka'], 10183,  6,  14, 24), # noqa
     'O3': (['-O3'],  4, [], [],        1957,  4,   2, 12), # noqa; in -O3, -Os and -Oz we metadce
     'Os': (['-Os'],  4, [], [],        1963,  4,   2, 12), # noqa
@@ -8235,7 +8235,7 @@ def test_metadce_hello_fastcomp(self, *args):
                            3, [], [], 6309,  3,  3,  5),         # noqa
     # without argc/argv, no support code for them is emitted
     'O3_standalone_narg': ('mem_no_argv.c', ['-O3', '-s', 'STANDALONE_WASM'],
-                           1, [], [], 6309,  1,  3,  5),         # noqa
+                           1, [], [], 6309,  1,  3,  4),         # noqa
     # without main, no support code for argc/argv is emitted either
     'O3_standalone_lib':  ('mem_no_main.c', ['-O3', '-s', 'STANDALONE_WASM'],
                            0, [], [], 6309,  0,  3,  4),         # noqa
@@ -8248,7 +8248,7 @@ def test_metadce_hello_fastcomp(self, *args):
     # without argc/argv, no support code for them is emitted, even with lto
     'O3_standalone_narg_flto':
                           ('mem_no_argv.c', ['-O3', '-s', 'STANDALONE_WASM', '-flto'],
-                           1, [], [], 6309,  1,  3,  5),         # noqa
+                           1, [], [], 6309,  1,  3,  4),         # noqa
   })
   @no_fastcomp()
   def test_metadce_mem(self, filename, *args):