Skip to content

Commit 8caba6e

Browse files
sbc100sbc100
authored
Improve check for instantiateStreaming. NFC (#24785)
This mirrors the check that exists under `MINIMAL_RUNTIME` in `postamble_minimal.js`
1 parent e3188a0 commit 8caba6e

File tree

47 files changed

+194
-182
lines changed

Some content is hidden

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

47 files changed

+194
-182
lines changed

‎src/preamble.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,11 @@ async function instantiateArrayBuffer(binaryFile, imports) {
692692

693693
async function instantiateAsync(binary, binaryFile, imports) {
694694
#if !SINGLE_FILE
695-
if (!binary && typeof WebAssembly.instantiateStreaming == 'function'
695+
if (!binary
696+
#if MIN_FIREFOX_VERSION < 58 || MIN_CHROME_VERSION < 61 || MIN_SAFARI_VERSION < 150000
697+
// See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/instantiateStreaming
698+
&& WebAssembly.instantiateStreaming
699+
#endif
696700
#if ENVIRONMENT_MAY_BE_WEBVIEW
697701
// Don't use streaming for file:// delivered objects in a webview, fetch them synchronously.
698702
&& !isFileURI(binaryFile)

‎test/code_size/test_codesize_cxx_ctors1.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19802,
3-
"a.out.js.gz": 8162,
2+
"a.out.js": 19749,
3+
"a.out.js.gz": 8155,
44
"a.out.nodebug.wasm": 129507,
55
"a.out.nodebug.wasm.gz": 49234,
6-
"total": 149309,
7-
"total_gz": 57396,
6+
"total": 149256,
7+
"total_gz": 57389,
88
"sent": [
99
"__cxa_throw",
1010
"_abort_js",

‎test/code_size/test_codesize_cxx_ctors2.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19780,
3-
"a.out.js.gz": 8151,
2+
"a.out.js": 19727,
3+
"a.out.js.gz": 8145,
44
"a.out.nodebug.wasm": 128935,
55
"a.out.nodebug.wasm.gz": 48881,
6-
"total": 148715,
7-
"total_gz": 57032,
6+
"total": 148662,
7+
"total_gz": 57026,
88
"sent": [
99
"__cxa_throw",
1010
"_abort_js",

‎test/code_size/test_codesize_cxx_except.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 23463,
3-
"a.out.js.gz": 9150,
2+
"a.out.js": 23410,
3+
"a.out.js.gz": 9146,
44
"a.out.nodebug.wasm": 171285,
55
"a.out.nodebug.wasm.gz": 57342,
6-
"total": 194748,
7-
"total_gz": 66492,
6+
"total": 194695,
7+
"total_gz": 66488,
88
"sent": [
99
"__cxa_begin_catch",
1010
"__cxa_end_catch",

‎test/code_size/test_codesize_cxx_except_wasm.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19691,
3-
"a.out.js.gz": 8110,
2+
"a.out.js": 19638,
3+
"a.out.js.gz": 8102,
44
"a.out.nodebug.wasm": 144643,
55
"a.out.nodebug.wasm.gz": 54892,
6-
"total": 164334,
7-
"total_gz": 63002,
6+
"total": 164281,
7+
"total_gz": 62994,
88
"sent": [
99
"_abort_js",
1010
"_tzset_js",

‎test/code_size/test_codesize_cxx_except_wasm_legacy.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19691,
3-
"a.out.js.gz": 8110,
2+
"a.out.js": 19638,
3+
"a.out.js.gz": 8102,
44
"a.out.nodebug.wasm": 142232,
55
"a.out.nodebug.wasm.gz": 54356,
6-
"total": 161923,
7-
"total_gz": 62466,
6+
"total": 161870,
7+
"total_gz": 62458,
88
"sent": [
99
"_abort_js",
1010
"_tzset_js",

‎test/code_size/test_codesize_cxx_lto.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19130,
3-
"a.out.js.gz": 7843,
2+
"a.out.js": 19077,
3+
"a.out.js.gz": 7835,
44
"a.out.nodebug.wasm": 106474,
55
"a.out.nodebug.wasm.gz": 42624,
6-
"total": 125604,
7-
"total_gz": 50467,
6+
"total": 125551,
7+
"total_gz": 50459,
88
"sent": [
99
"a (emscripten_resize_heap)",
1010
"b (_setitimer_js)",

‎test/code_size/test_codesize_cxx_mangle.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 23513,
3-
"a.out.js.gz": 9167,
2+
"a.out.js": 23460,
3+
"a.out.js.gz": 9162,
44
"a.out.nodebug.wasm": 235326,
55
"a.out.nodebug.wasm.gz": 78948,
6-
"total": 258839,
7-
"total_gz": 88115,
6+
"total": 258786,
7+
"total_gz": 88110,
88
"sent": [
99
"__cxa_begin_catch",
1010
"__cxa_end_catch",

‎test/code_size/test_codesize_cxx_noexcept.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 19802,
3-
"a.out.js.gz": 8162,
2+
"a.out.js": 19749,
3+
"a.out.js.gz": 8155,
44
"a.out.nodebug.wasm": 131925,
55
"a.out.nodebug.wasm.gz": 50235,
6-
"total": 151727,
7-
"total_gz": 58397,
6+
"total": 151674,
7+
"total_gz": 58390,
88
"sent": [
99
"__cxa_throw",
1010
"_abort_js",

‎test/code_size/test_codesize_cxx_wasmfs.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"a.out.js": 7192,
3-
"a.out.js.gz": 3346,
2+
"a.out.js": 7138,
3+
"a.out.js.gz": 3337,
44
"a.out.nodebug.wasm": 169797,
55
"a.out.nodebug.wasm.gz": 63081,
6-
"total": 176989,
7-
"total_gz": 66427,
6+
"total": 176935,
7+
"total_gz": 66418,
88
"sent": [
99
"__cxa_throw",
1010
"_abort_js",

0 commit comments

Comments
 (0)