Skip to content

Commit c08fbb0

Browse files
authored
[embind] Autogen EM_METHOD_CALLER_KIND bindings. NFC (#24521)
1 parent 2fe9aeb commit c08fbb0

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

src/lib/libemval.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ var LibraryEmVal = {
320320
321321
var offset = 0;
322322
var argsList = []; // 'obj?, arg0, arg1, arg2, ... , argN'
323-
if (kind === /* FUNCTION */ 0) {
323+
if (kind === {{{ cDefs['internal::EM_METHOD_CALLER_KIND::FUNCTION'] }}}) {
324324
argsList.push('obj');
325325
}
326326
var params = ['retType'];
@@ -333,7 +333,7 @@ var LibraryEmVal = {
333333
` var arg${i} = argType${i}.readValueFromPointer(args${offset ? '+' + offset : ''});\n`;
334334
offset += GenericWireTypeSize;
335335
}
336-
var invoker = kind === /* CONSTRUCTOR */ 1 ? 'new func' : 'func.call';
336+
var invoker = kind === {{{ cDefs['internal::EM_METHOD_CALLER_KIND::CONSTRUCTOR'] }}} ? 'new func' : 'func.call';
337337
functionBody +=
338338
` var rv = ${invoker}(${argsList.join(', ')});\n`;
339339
if (!retType.isVoid) {

src/struct_info_cxx.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,13 @@
2323
"wasmfs::File::DirectoryKind",
2424
"wasmfs::File::SymlinkKind"
2525
]
26+
},
27+
// Embind
28+
{
29+
"file": "emscripten/val.h",
30+
"defines": [
31+
"emscripten::internal::EM_METHOD_CALLER_KIND::FUNCTION",
32+
"emscripten::internal::EM_METHOD_CALLER_KIND::CONSTRUCTOR"
33+
]
2634
}
2735
]

src/struct_info_generated.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,9 @@
515515
"__WASI_RIGHTS_PATH_SYMLINK": 16777216,
516516
"__WASI_RIGHTS_PATH_UNLINK_FILE": 67108864,
517517
"__WASI_RIGHTS_POLL_FD_READWRITE": 134217728,
518-
"__WASI_RIGHTS_SOCK_SHUTDOWN": 268435456
518+
"__WASI_RIGHTS_SOCK_SHUTDOWN": 268435456,
519+
"internal::EM_METHOD_CALLER_KIND::CONSTRUCTOR": 1,
520+
"internal::EM_METHOD_CALLER_KIND::FUNCTION": 0
519521
},
520522
"structs": {
521523
"AudioParamFrame": {

src/struct_info_generated_wasm64.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,9 @@
515515
"__WASI_RIGHTS_PATH_SYMLINK": 16777216,
516516
"__WASI_RIGHTS_PATH_UNLINK_FILE": 67108864,
517517
"__WASI_RIGHTS_POLL_FD_READWRITE": 134217728,
518-
"__WASI_RIGHTS_SOCK_SHUTDOWN": 268435456
518+
"__WASI_RIGHTS_SOCK_SHUTDOWN": 268435456,
519+
"internal::EM_METHOD_CALLER_KIND::CONSTRUCTOR": 1,
520+
"internal::EM_METHOD_CALLER_KIND::FUNCTION": 0
519521
},
520522
"structs": {
521523
"AudioParamFrame": {

0 commit comments

Comments
 (0)