Skip to content

Update test_no_legalize_js_ffi in preparation for binaryen change #21599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 1 commit into from
Mar 23, 2024
Merged

Update test_no_legalize_js_ffi in preparation for binaryen change #21599

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8620,25 +8620,18 @@ def test_legalize_js_ffi(self):
assert not e_f32_f64, 'f32 converted to f64 in exports'
assert e_i64_i64, 'i64 converted to i64 in exports'

@disabled('https://github.com/WebAssembly/binaryen/pull/6428')
Copy link
Member

@kripken kripken Mar 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe just delete it, as we'll not want to re-enable it?

Copy link
Collaborator Author

@sbc100 sbc100 Mar 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess its still tests the -sLEGALIZE_JS_FFI=0 setting itself. I guess we should remove this once we remove that setting?

def test_no_legalize_js_ffi(self):
# test minimal JS FFI legalization for invoke and dyncalls
args = ['-sLEGALIZE_JS_FFI=0', '-sMAIN_MODULE=2', '-O3', '-sDISABLE_EXCEPTION_CATCHING=0']
delete_file('a.out.wasm')
with env_modify({'EMCC_FORCE_STDLIBS': 'libc++'}):
cmd = [EMXX, test_file('other/noffi.cpp'), '-g', '-o', 'a.out.js'] + args
print(' '.join(cmd))
self.run_process(cmd)
text = self.get_wasm_text('a.out.wasm')
# remove internal comments and extra whitespace
text = re.sub(r'\(;[^;]+;\)', '', text)
text = re.sub(r'\$var\$*.', '', text)
text = re.sub(r'param \$\d+', 'param ', text)
text = re.sub(r' +', ' ', text)
# print("text: %s" % text)
i_legalimport_i64 = re.search(r'\(import.*\$legalimport\$invoke_j.*', text)
e_legalstub_i32 = re.search(r'\(func.*\$legalstub\$dyn.*\(result i32\)', text)
assert i_legalimport_i64, 'legal import not generated for invoke call'
assert e_legalstub_i32, 'legal stub not generated for dyncall'
for legalizing in [0, 1]:
# test minimal JS FFI legalization for invoke and dyncalls
args = ['-sMAIN_MODULE=2', '-O3', '-sDISABLE_EXCEPTION_CATCHING=0', '-g']
if not legalizing:
args.append('-sLEGALIZE_JS_FFI=0')
self.run_process([EMXX, test_file('other/noffi.cpp')] + args)
text = self.get_wasm_text('a.out.wasm')
# Verify that legalization either did, or did not, occur
self.assertContainedIf('$legalimport', text, legalizing)
self.assertContainedIf('$legalstub', text, legalizing)

def test_export_aliasee(self):
# build side module
Expand Down