Skip to content

Commit cd097fb

Browse files
authored
Simplify makeModuleReceiveWithVar. NFC (#22356)
This means that makeModuleReceiveWithVar results in a single statements instead of two: var foo = Module['foo']; vs: var foo; if (Module['foo']) foo = Module['foo']; Saves a little on code size.
1 parent bd8b894 commit cd097fb

File tree

65 files changed

+74
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+74
-68
lines changed

src/parseTools.mjs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -866,8 +866,7 @@ function makeModuleReceiveWithVar(localName, moduleName, defaultValue, noAssert)
866866
if (defaultValue) {
867867
ret += ` = Module['${moduleName}'] || ${defaultValue};`;
868868
} else {
869-
ret += `; ${makeModuleReceive(localName, moduleName)}`;
870-
return ret;
869+
ret += ` = Module['${moduleName}'];`;
871870
}
872871
}
873872
if (!noAssert) {

src/preamble.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ if (Module['doWasm2JS']) {
3434
#endif
3535
#endif
3636

37+
#if MAYBE_WASM2JS
38+
if (WebAssembly.isWasm2js) {
39+
// We don't need to actually download a wasm binary, mark it as present but
40+
// empty.
41+
wasmBinary = [];
42+
}
43+
#endif
44+
3745
#if ASSERTIONS && WASM == 1
3846
if (typeof WebAssembly != 'object') {
3947
err('no native wasm support detected');

src/wasm2js.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,9 @@ WebAssembly = {
8787
};
8888
},
8989

90-
RuntimeError: Error
91-
};
90+
RuntimeError: Error,
9291

9392
#if !MINIMAL_RUNTIME
94-
// We don't need to actually download a wasm binary, mark it as present but empty.
95-
wasmBinary = [];
93+
isWasm2js: true,
9694
#endif
95+
};
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8546
1+
8540
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20923
1+
20901
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8530
1+
8524
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20891
1+
20869
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9588
1+
9581
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24829
1+
24807
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8498
1+
8492

0 commit comments

Comments
 (0)