Skip to content

Fix cwrap with returnType 'boolean' to return a JS boolean #27023

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

Open
esgott wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −3
Open

Fix cwrap with returnType 'boolean' to return a JS boolean #27023

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/lib/libccall.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ addToLibrary({
// When the function takes numbers and returns a number, we can just return
// the original function
var numericArgs = !argTypes || argTypes.every((type) => type === 'number' || type === 'boolean');
var numericRet = returnType !== 'string';
var numericRet = returnType !== 'string' && returnType !== 'boolean';
if (numericRet && numericArgs && !opts) {
return getCFunc(ident);
}
Expand Down
8 changes: 6 additions & 2 deletions test/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7097,10 +7097,14 @@ def test_ccall_cwrap_fast_path(self):
create_file('post.js', '''
var printBool = Module['cwrap']('print_bool', null, ['boolean']);
out(Module['_print_bool'] === printBool); // the function should be the exact raw function in the module rather than a wrapped one
var getBool = Module['cwrap']('get_bool', 'boolean');
out(Module['_get_bool'] !== getBool); // boolean return must not use the fast path so the result is coerced to a JS boolean
var ret = getBool();
out([typeof ret, ret].join(','));
''')

self.set_setting('EXPORTED_FUNCTIONS', ['_print_bool'])
self.do_runf('core/test_ccall.cpp', 'true', cflags=['--post-js=post.js', '-Wno-return-stack-address'])
self.set_setting('EXPORTED_FUNCTIONS', ['_print_bool', '_get_bool'])
self.do_runf('core/test_ccall.cpp', 'true\ntrue\nboolean,true\n', cflags=['--post-js=post.js', '-Wno-return-stack-address'])

@no_modularize_instance('ccall is not yet compatible with MODULARIZE=instance')
def test_ccall_return_pointer(self):
Expand Down