feedback

Author: sbc100

tests/test_core.py

@@ -7826,16 +7826,6 @@ def test_asyncify_unused(self):
     self.set_setting('ASYNCIFY', 1)
     self.do_run_in_out_file_test('tests', 'core', 'test_hello_world')
 
-<<<<<<< HEAD
-  @no_wasm_backend('EMTERPRETIFY causes JSOptimizer to run, which is '
-                   'unsupported with Wasm backend')
-  def test_coroutine_emterpretify_async(self):
-    self.emcc_args.append('-Wno-emterpreter')
-    # The same EMTERPRETIFY_WHITELIST should be in other.test_emterpreter_advise
-    self.do_test_coroutine({'EMTERPRETIFY': 1, 'EMTERPRETIFY_ASYNC': 1, 'EMTERPRETIFY_WHITELIST': ['_fib', '_f', '_g'], 'ASSERTIONS': 1})
-
-=======
->>>>>>> 02339ca62... Remove emterpreter support.
   @parameterized({
     'normal': ([], True),
     'blacklist_a': (['-s', 'ASYNCIFY_BLACKLIST=["foo(int, double)"]'], False),
@@ -7864,21 +7854,6 @@ def test_asyncify_lists(self, args, should_pass, response=None):
       if should_pass:
         raise
 
-<<<<<<< HEAD
-  # Test basic emterpreter functionality in all core compilation modes.
-  @no_emterpreter
-  @no_wasm_backend('EMTERPRETIFY causes JSOptimizer to run, which is '
-                   'unsupported with Wasm backend')
-  def test_emterpretify(self):
-    self.emcc_args.append('-Wno-emterpreter')
-    self.set_setting('EMTERPRETIFY', 1)
-    self.do_run_in_out_file_test('tests', 'core', 'test_hello_world')
-    print('async')
-    self.set_setting('EMTERPRETIFY_ASYNC', 1)
-    self.do_run_in_out_file_test('tests', 'core', 'test_hello_world')
-
-=======
->>>>>>> 02339ca62... Remove emterpreter support.
   @no_fastcomp('wasm-backend specific feature')
   def test_emscripten_scan_registers(self):
     self.set_setting('ASYNCIFY', 1)
@@ -8733,13 +8708,6 @@ def setUp(self):
 wasm2ss = make_run('wasm2ss', emcc_args=['-O2'], settings={'STACK_OVERFLOW_CHECK': 2})
 strict = make_run('strict', emcc_args=['-O2'], settings={'DEFAULT_TO_CXX': 0})
 
-<<<<<<< HEAD
-if not shared.Settings.WASM_BACKEND:
-  # emterpreter
-  asm2i = make_run('asm2i', emcc_args=['-O2', '-Wno-emterpreter'], settings={'EMTERPRETIFY': 1, 'WASM': 0})
-
-=======
->>>>>>> 02339ca62... Remove emterpreter support.
 if shared.Settings.WASM_BACKEND:
   lsan = make_run('lsan', emcc_args=['-fsanitize=leak'], settings={'ALLOW_MEMORY_GROWTH': 1})
   asan = make_run('asan', emcc_args=['-fsanitize=address'], settings={'ALLOW_MEMORY_GROWTH': 1, 'ASAN_SHADOW_SIZE': 128 * 1024 * 1024})

tests/test_other.py

@@ -5444,6 +5444,42 @@ def test_stat_fail_alongtheway(self):
 pass: error == ENOTDIR
 ''', run_js('a.out.js'))
 
+  def test_link_with_a_static(self):
+    create_test_file('x.c', r'''
+int init_weakref(int a, int b) {
+  return a + b;
+}
+''')
+    create_test_file('y.c', r'''
+static int init_weakref(void) { // inlined in -O2, not in -O0 where it shows up in llvm-nm as 't'
+  return 150;
+}
+
+int testy(void) {
+  return init_weakref();
+}
+''')
+    create_test_file('z.c', r'''
+extern int init_weakref(int, int);
+extern int testy(void);
+
+int main(void) {
+  return testy() + init_weakref(5, 6);
+}
+''')
+    run_process([PYTHON, EMCC, 'x.c', '-o', 'x.o'])
+    run_process([PYTHON, EMCC, 'y.c', '-o', 'y.o'])
+    run_process([PYTHON, EMCC, 'z.c', '-o', 'z.o'])
+    try_delete('libtest.a')
+    run_process([PYTHON, EMAR, 'rc', 'libtest.a', 'y.o'])
+    run_process([PYTHON, EMAR, 'rc', 'libtest.a', 'x.o'])
+    run_process([PYTHON, EMRANLIB, 'libtest.a'])
+
+    for args in [[], ['-O2']]:
+      print('args:', args)
+      run_process([PYTHON, EMCC, 'z.o', 'libtest.a', '-s', 'EXIT_RUNTIME=1'] + args)
+      run_js('a.out.js', assert_returncode=161)
+
   def test_link_with_bad_o_in_a(self):
     # when building a .a, we force-include all the objects inside it. but, some
     # may not be valid bitcode, e.g. if it contains metadata or something else