Skip to content

[embind] Always enable assertions during TypeScript generation. #21695

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
merged 6 commits into from
Sep 26, 2024
Merged

[embind] Always enable assertions during TypeScript generation. #21695

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0483145
[embind] Always enable assertions during TypeScript generation.
brendandahl Apr 4, 2024
cd763dc
Merge branch 'main' into tsgen-enable-assertions
brendandahl Sep 24, 2024
1c14d74
Review comment.
brendandahl Sep 24, 2024
9652bd7
Use ifdefs.
brendandahl Sep 26, 2024
762bde7
Remove always assert.
brendandahl Sep 26, 2024
08a4ed2
Use exceptions.
brendandahl Sep 26, 2024
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
4 changes: 3 additions & 1 deletion test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3384,7 +3384,9 @@ def test_embind_tsgen_ignore(self):
extra_args = ['-sMODULARIZE',
'--embed-file', 'fail.js',
'-sMINIMAL_RUNTIME=2',
'-sEXPORT_ES6=1']
'-sEXPORT_ES6=1',
'-sASSERTIONS=0',
'-sSTRICT=1']
self.emcc(test_file('other/embind_tsgen.cpp'), extra_args)
self.assertFileContents(test_file('other/embind_tsgen_ignore_2.d.ts'), read_file('embind_tsgen.d.ts'))
# Also test this separately since it conflicts with other settings.
Expand Down
2 changes: 2 additions & 0 deletions tools/link.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1966,6 +1966,8 @@ def run_embind_gen(wasm_target, js_syms, extra_settings, linker_inputs):
settings.SINGLE_FILE = False
# Embind may be included multiple times, de-duplicate the list first.
settings.JS_LIBRARIES = dedup_list(settings.JS_LIBRARIES)
# JS and TS generation expects assert to always be defined.
settings.ASSERTIONS = 1
# Replace embind with the TypeScript generation version.
embind_index = settings.JS_LIBRARIES.index('embind/embind.js')
settings.JS_LIBRARIES[embind_index] = 'embind/embind_gen.js'
Expand Down
Loading