From dc264342e4d304a77da92642a737bbeb49d0c9ac Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 5 Mar 2020 16:55:09 -0800 Subject: Asyncify: Fix wasm-only instrumentation of unnamed imports (#2682) We assumed that the imports were already named (in their internal name) properly. When processing a binary file without names, or if the names don't match in general, that's not true. To fix this, use ModuleUtils::renameFunctions to do a proper renaming up front. Also fix renameFunctions to not assert on the case of renaming a function to the same name it already has. Helps #2680 --- test/unit/test_asyncify.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'test/unit/test_asyncify.py') diff --git a/test/unit/test_asyncify.py b/test/unit/test_asyncify.py index 356a4935a..331e1a9e2 100644 --- a/test/unit/test_asyncify.py +++ b/test/unit/test_asyncify.py @@ -24,11 +24,20 @@ class AsyncifyTest(utils.BinaryenTestCase): test(['-Os', '-g']) def test_asyncify_pure_wasm(self): - shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '--asyncify', '-o', 'a.wasm']) - shared.run_process(shared.WASM_DIS + ['a.wasm', '-o', 'a.wat']) - output = shared.run_process(shared.WASM_SHELL + ['a.wat'], capture_output=True).stdout - with open(self.input_path('asyncify-pure.txt'), 'r') as f: - self.assertEqual(f.read(), output) + def test(input_file): + shared.run_process(shared.WASM_OPT + [input_file, '--asyncify', '-o', 'a.wasm']) + shared.run_process(shared.WASM_DIS + ['a.wasm', '-o', 'a.wat']) + output = shared.run_process(shared.WASM_SHELL + ['a.wat'], capture_output=True).stdout + with open(self.input_path('asyncify-pure.txt'), 'r') as f: + self.assertEqual(f.read(), output) + + # test wat input + wat = self.input_path('asyncify-pure.wat') + test(wat) + + # test wasm input + shared.run_process(shared.WASM_AS + [wat, '-o', 'a.wasm']) + test('a.wasm') def test_asyncify_list_bad(self): for arg, warning in [ -- cgit v1.2.3