Skip to content

Commit 40261df

Browse files
authored
Improve missing export assertion. NFC (#25601)
1 parent e35d118 commit 40261df

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

test/codesize/test_codesize_hello_O0.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 24070,
3-
"a.out.js.gz": 8666,
2+
"a.out.js": 24334,
3+
"a.out.js.gz": 8676,
44
"a.out.nodebug.wasm": 15119,
55
"a.out.nodebug.wasm.gz": 7444,
6-
"total": 39189,
7-
"total_gz": 16110,
6+
"total": 39453,
7+
"total_gz": 16120,
88
"sent": [
99
"fd_write"
1010
],

test/codesize/test_codesize_minimal_O0.expected.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,27 +1320,27 @@ var __indirect_function_table = makeInvalidEarlyAccess('__indirect_function_tabl
13201320
var wasmMemory = makeInvalidEarlyAccess('wasmMemory');
13211321

13221322
function assignWasmExports(wasmExports) {
1323-
assert(wasmExports['add'], 'missing Wasm export: add');
1323+
assert(typeof wasmExports['add'] != 'undefined', 'missing Wasm export: add');
13241324
_add = Module['_add'] = createExportWrapper('add', 2);
1325-
assert(wasmExports['fflush'], 'missing Wasm export: fflush');
1325+
assert(typeof wasmExports['fflush'] != 'undefined', 'missing Wasm export: fflush');
13261326
_fflush = createExportWrapper('fflush', 1);
1327-
assert(wasmExports['emscripten_stack_init'], 'missing Wasm export: emscripten_stack_init');
1327+
assert(typeof wasmExports['emscripten_stack_init'] != 'undefined', 'missing Wasm export: emscripten_stack_init');
13281328
_emscripten_stack_init = wasmExports['emscripten_stack_init'];
1329-
assert(wasmExports['emscripten_stack_get_free'], 'missing Wasm export: emscripten_stack_get_free');
1329+
assert(typeof wasmExports['emscripten_stack_get_free'] != 'undefined', 'missing Wasm export: emscripten_stack_get_free');
13301330
_emscripten_stack_get_free = wasmExports['emscripten_stack_get_free'];
1331-
assert(wasmExports['emscripten_stack_get_base'], 'missing Wasm export: emscripten_stack_get_base');
1331+
assert(typeof wasmExports['emscripten_stack_get_base'] != 'undefined', 'missing Wasm export: emscripten_stack_get_base');
13321332
_emscripten_stack_get_base = wasmExports['emscripten_stack_get_base'];
1333-
assert(wasmExports['emscripten_stack_get_end'], 'missing Wasm export: emscripten_stack_get_end');
1333+
assert(typeof wasmExports['emscripten_stack_get_end'] != 'undefined', 'missing Wasm export: emscripten_stack_get_end');
13341334
_emscripten_stack_get_end = wasmExports['emscripten_stack_get_end'];
1335-
assert(wasmExports['_emscripten_stack_restore'], 'missing Wasm export: _emscripten_stack_restore');
1335+
assert(typeof wasmExports['_emscripten_stack_restore'] != 'undefined', 'missing Wasm export: _emscripten_stack_restore');
13361336
__emscripten_stack_restore = wasmExports['_emscripten_stack_restore'];
1337-
assert(wasmExports['_emscripten_stack_alloc'], 'missing Wasm export: _emscripten_stack_alloc');
1337+
assert(typeof wasmExports['_emscripten_stack_alloc'] != 'undefined', 'missing Wasm export: _emscripten_stack_alloc');
13381338
__emscripten_stack_alloc = wasmExports['_emscripten_stack_alloc'];
1339-
assert(wasmExports['emscripten_stack_get_current'], 'missing Wasm export: emscripten_stack_get_current');
1339+
assert(typeof wasmExports['emscripten_stack_get_current'] != 'undefined', 'missing Wasm export: emscripten_stack_get_current');
13401340
_emscripten_stack_get_current = wasmExports['emscripten_stack_get_current'];
1341-
assert(wasmExports['memory'], 'missing Wasm export: memory');
1341+
assert(typeof wasmExports['memory'] != 'undefined', 'missing Wasm export: memory');
13421342
memory = wasmMemory = wasmExports['memory'];
1343-
assert(wasmExports['__indirect_function_table'], 'missing Wasm export: __indirect_function_table');
1343+
assert(typeof wasmExports['__indirect_function_table'] != 'undefined', 'missing Wasm export: __indirect_function_table');
13441344
__indirect_function_table = wasmExports['__indirect_function_table'];
13451345
}
13461346

test/codesize/test_codesize_minimal_O0.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19262,
3-
"a.out.js.gz": 6966,
2+
"a.out.js": 19504,
3+
"a.out.js.gz": 6976,
44
"a.out.nodebug.wasm": 1136,
55
"a.out.nodebug.wasm.gz": 659,
6-
"total": 20398,
7-
"total_gz": 7625,
6+
"total": 20640,
7+
"total_gz": 7635,
88
"sent": [],
99
"imports": [],
1010
"exports": [
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
2-
"hello_world.js": 56592,
3-
"hello_world.js.gz": 17608,
2+
"hello_world.js": 56856,
3+
"hello_world.js.gz": 17627,
44
"hello_world.wasm": 15119,
55
"hello_world.wasm.gz": 7444,
66
"no_asserts.js": 26634,
77
"no_asserts.js.gz": 8883,
88
"no_asserts.wasm": 12219,
99
"no_asserts.wasm.gz": 6005,
10-
"strict.js": 54607,
11-
"strict.js.gz": 16955,
10+
"strict.js": 54871,
11+
"strict.js.gz": 16967,
1212
"strict.wasm": 15119,
1313
"strict.wasm.gz": 7442,
14-
"total": 180290,
15-
"total_gz": 64337
14+
"total": 180818,
15+
"total_gz": 64368
1616
}

tools/emscripten.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ def create_receiving(function_exports, other_exports, library_symbols, aliases):
993993
if do_module_exports and should_export(mangled):
994994
assignment += f" = Module['{mangled}']"
995995
if settings.ASSERTIONS:
996-
receiving.append(f" assert(wasmExports['{sym}'], 'missing Wasm export: {sym}');")
996+
receiving.append(f" assert(typeof wasmExports['{sym}'] != 'undefined', 'missing Wasm export: {sym}');")
997997
if sym in alias_inverse_map:
998998
for target in alias_inverse_map[sym]:
999999
assignment += f" = {target}"

0 commit comments

Comments
 (0)