Skip to content

Commit 268b91a

Browse files
lkwintalkwinta
authored
Merge branch 'main' into file_packager_modularize
2 parents 46c1890 + 90250aa commit 268b91a

File tree

369 files changed

+7231
-6642
lines changed

Some content is hidden

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

369 files changed

+7231
-6642
lines changed

‎.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ jobs:
6161
echo "Checking out ${{ github.base_ref }}"
6262
git checkout ${{ github.base_ref }}
6363
git rev-parse HEAD
64-
# Hack to honor changes to rebaseline_tests.py in the current PR
65-
git checkout - ./tools/maint/rebaseline_tests.py
64+
# Uncomment this like to pull the rebaseline_tests.py from the
65+
# current branch:
66+
# git checkout - ./tools/maint/rebaseline_tests.py
6667
./bootstrap
6768
if ! ./tools/maint/rebaseline_tests.py --check-only; then
6869
echo "Test expectations are out-of-date on the target branch."

‎src/postamble_modularize.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// We assign to the `moduleRtn` global here and configure closure to see
55
// this as and extern so it won't get minified.
66

7-
#if WASM_ASYNC_COMPILATION
8-
97
#if USE_READY_PROMISE
108
if (runtimeInitialized) {
119
moduleRtn = Module;
@@ -20,12 +18,6 @@ if (runtimeInitialized) {
2018
moduleRtn = {};
2119
#endif
2220

23-
#else // WASM_ASYNC_COMPILATION
24-
25-
moduleRtn = Module;
26-
27-
#endif // WASM_ASYNC_COMPILATION
28-
2921
#if ASSERTIONS
3022
// Assertion for attempting to access module properties on the incoming
3123
// moduleArg. In the past we used this object as the prototype of the module

‎test/browser/test_small_js_flags.js.size

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/code_size/test_codesize_cxx_ctors1.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"a.out.js": 19802,
3+
"a.out.js.gz": 8162,
4+
"a.out.nodebug.wasm": 129507,
5+
"a.out.nodebug.wasm.gz": 49234,
6+
"total": 149309,
7+
"total_gz": 57396,
8+
"sent": [
9+
"__cxa_throw",
10+
"_abort_js",
11+
"_tzset_js",
12+
"emscripten_resize_heap",
13+
"environ_get",
14+
"environ_sizes_get",
15+
"fd_close",
16+
"fd_read",
17+
"fd_seek",
18+
"fd_write"
19+
],
20+
"imports": [
21+
"env.__cxa_throw",
22+
"env._abort_js",
23+
"env._tzset_js",
24+
"env.emscripten_resize_heap",
25+
"wasi_snapshot_preview1.environ_get",
26+
"wasi_snapshot_preview1.environ_sizes_get",
27+
"wasi_snapshot_preview1.fd_close",
28+
"wasi_snapshot_preview1.fd_read",
29+
"wasi_snapshot_preview1.fd_seek",
30+
"wasi_snapshot_preview1.fd_write"
31+
],
32+
"exports": [
33+
"__indirect_function_table",
34+
"__wasm_call_ctors",
35+
"_emscripten_stack_alloc",
36+
"_emscripten_stack_restore",
37+
"emscripten_stack_get_current",
38+
"main",
39+
"memory"
40+
]
41+
}

‎test/code_size/test_codesize_cxx_ctors2.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"a.out.js": 19780,
3+
"a.out.js.gz": 8151,
4+
"a.out.nodebug.wasm": 128935,
5+
"a.out.nodebug.wasm.gz": 48881,
6+
"total": 148715,
7+
"total_gz": 57032,
8+
"sent": [
9+
"__cxa_throw",
10+
"_abort_js",
11+
"_tzset_js",
12+
"emscripten_resize_heap",
13+
"environ_get",
14+
"environ_sizes_get",
15+
"fd_close",
16+
"fd_read",
17+
"fd_seek",
18+
"fd_write"
19+
],
20+
"imports": [
21+
"env._abort_js",
22+
"env._tzset_js",
23+
"env.emscripten_resize_heap",
24+
"wasi_snapshot_preview1.fd_close",
25+
"wasi_snapshot_preview1.fd_read",
26+
"wasi_snapshot_preview1.fd_seek",
27+
"wasi_snapshot_preview1.fd_write"
28+
],
29+
"exports": [
30+
"__indirect_function_table",
31+
"_emscripten_stack_alloc",
32+
"_emscripten_stack_restore",
33+
"emscripten_stack_get_current",
34+
"main",
35+
"memory"
36+
]
37+
}

‎test/code_size/test_codesize_cxx_except.json

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
{
2+
"a.out.js": 23463,
3+
"a.out.js.gz": 9150,
4+
"a.out.nodebug.wasm": 171285,
5+
"a.out.nodebug.wasm.gz": 57342,
6+
"total": 194748,
7+
"total_gz": 66492,
8+
"sent": [
9+
"__cxa_begin_catch",
10+
"__cxa_end_catch",
11+
"__cxa_find_matching_catch_2",
12+
"__cxa_find_matching_catch_3",
13+
"__cxa_rethrow",
14+
"__cxa_throw",
15+
"__cxa_uncaught_exceptions",
16+
"__resumeException",
17+
"_abort_js",
18+
"_tzset_js",
19+
"emscripten_resize_heap",
20+
"environ_get",
21+
"environ_sizes_get",
22+
"fd_close",
23+
"fd_read",
24+
"fd_seek",
25+
"fd_write",
26+
"invoke_diii",
27+
"invoke_fiii",
28+
"invoke_i",
29+
"invoke_ii",
30+
"invoke_iii",
31+
"invoke_iiii",
32+
"invoke_iiiii",
33+
"invoke_iiiiii",
34+
"invoke_iiiiiii",
35+
"invoke_iiiiiiii",
36+
"invoke_iiiiiiiiiii",
37+
"invoke_iiiiiiiiiiii",
38+
"invoke_iiiiiiiiiiiii",
39+
"invoke_jiiii",
40+
"invoke_v",
41+
"invoke_vi",
42+
"invoke_vii",
43+
"invoke_viii",
44+
"invoke_viiii",
45+
"invoke_viiiiiii",
46+
"invoke_viiiiiiiiii",
47+
"invoke_viiiiiiiiiiiiiii"
48+
],
49+
"imports": [
50+
"env.__cxa_begin_catch",
51+
"env.__cxa_end_catch",
52+
"env.__cxa_find_matching_catch_2",
53+
"env.__cxa_find_matching_catch_3",
54+
"env.__cxa_rethrow",
55+
"env.__cxa_throw",
56+
"env.__cxa_uncaught_exceptions",
57+
"env.__resumeException",
58+
"env._abort_js",
59+
"env._tzset_js",
60+
"env.emscripten_resize_heap",
61+
"env.invoke_diii",
62+
"env.invoke_fiii",
63+
"env.invoke_i",
64+
"env.invoke_ii",
65+
"env.invoke_iii",
66+
"env.invoke_iiii",
67+
"env.invoke_iiiii",
68+
"env.invoke_iiiiii",
69+
"env.invoke_iiiiiii",
70+
"env.invoke_iiiiiiii",
71+
"env.invoke_iiiiiiiiiiii",
72+
"env.invoke_jiiii",
73+
"env.invoke_v",
74+
"env.invoke_vi",
75+
"env.invoke_vii",
76+
"env.invoke_viii",
77+
"env.invoke_viiii",
78+
"env.invoke_viiiiiii",
79+
"env.invoke_viiiiiiiiii",
80+
"env.invoke_viiiiiiiiiiiiiii",
81+
"wasi_snapshot_preview1.environ_get",
82+
"wasi_snapshot_preview1.environ_sizes_get",
83+
"wasi_snapshot_preview1.fd_close",
84+
"wasi_snapshot_preview1.fd_read",
85+
"wasi_snapshot_preview1.fd_seek",
86+
"wasi_snapshot_preview1.fd_write"
87+
],
88+
"exports": [
89+
"__cxa_can_catch",
90+
"__cxa_decrement_exception_refcount",
91+
"__cxa_free_exception",
92+
"__cxa_get_exception_ptr",
93+
"__cxa_increment_exception_refcount",
94+
"__indirect_function_table",
95+
"__wasm_call_ctors",
96+
"_emscripten_stack_alloc",
97+
"_emscripten_stack_restore",
98+
"_emscripten_tempret_set",
99+
"emscripten_stack_get_current",
100+
"main",
101+
"memory",
102+
"setThrew"
103+
]
104+
}

‎test/code_size/test_codesize_cxx_except_wasm.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"a.out.js": 19691,
3+
"a.out.js.gz": 8110,
4+
"a.out.nodebug.wasm": 144643,
5+
"a.out.nodebug.wasm.gz": 54892,
6+
"total": 164334,
7+
"total_gz": 63002,
8+
"sent": [
9+
"_abort_js",
10+
"_tzset_js",
11+
"emscripten_resize_heap",
12+
"environ_get",
13+
"environ_sizes_get",
14+
"fd_close",
15+
"fd_read",
16+
"fd_seek",
17+
"fd_write"
18+
],
19+
"imports": [
20+
"env._abort_js",
21+
"env._tzset_js",
22+
"env.emscripten_resize_heap",
23+
"wasi_snapshot_preview1.environ_get",
24+
"wasi_snapshot_preview1.environ_sizes_get",
25+
"wasi_snapshot_preview1.fd_close",
26+
"wasi_snapshot_preview1.fd_read",
27+
"wasi_snapshot_preview1.fd_seek",
28+
"wasi_snapshot_preview1.fd_write"
29+
],
30+
"exports": [
31+
"__indirect_function_table",
32+
"__trap",
33+
"__wasm_call_ctors",
34+
"_emscripten_stack_alloc",
35+
"main",
36+
"memory"
37+
]
38+
}

‎test/code_size/test_codesize_cxx_except_wasm_legacy.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"a.out.js": 19691,
3+
"a.out.js.gz": 8110,
4+
"a.out.nodebug.wasm": 142232,
5+
"a.out.nodebug.wasm.gz": 54356,
6+
"total": 161923,
7+
"total_gz": 62466,
8+
"sent": [
9+
"_abort_js",
10+
"_tzset_js",
11+
"emscripten_resize_heap",
12+
"environ_get",
13+
"environ_sizes_get",
14+
"fd_close",
15+
"fd_read",
16+
"fd_seek",
17+
"fd_write"
18+
],
19+
"imports": [
20+
"env._abort_js",
21+
"env._tzset_js",
22+
"env.emscripten_resize_heap",
23+
"wasi_snapshot_preview1.environ_get",
24+
"wasi_snapshot_preview1.environ_sizes_get",
25+
"wasi_snapshot_preview1.fd_close",
26+
"wasi_snapshot_preview1.fd_read",
27+
"wasi_snapshot_preview1.fd_seek",
28+
"wasi_snapshot_preview1.fd_write"
29+
],
30+
"exports": [
31+
"__indirect_function_table",
32+
"__trap",
33+
"__wasm_call_ctors",
34+
"_emscripten_stack_alloc",
35+
"main",
36+
"memory"
37+
]
38+
}

‎test/code_size/test_codesize_cxx_lto.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"a.out.js": 19506,
3+
"a.out.js.gz": 8014,
4+
"a.out.nodebug.wasm": 121757,
5+
"a.out.nodebug.wasm.gz": 48787,
6+
"total": 141263,
7+
"total_gz": 56801,
8+
"sent": [
9+
"a (emscripten_resize_heap)",
10+
"b (_tzset_js)",
11+
"c (_setitimer_js)",
12+
"d (_emscripten_runtime_keepalive_clear)",
13+
"e (_abort_js)",
14+
"f (proc_exit)",
15+
"g (fd_write)",
16+
"h (fd_seek)",
17+
"i (fd_read)",
18+
"j (fd_close)",
19+
"k (environ_sizes_get)",
20+
"l (environ_get)"
21+
],
22+
"imports": [
23+
"a (emscripten_resize_heap)",
24+
"b (_tzset_js)",
25+
"c (_setitimer_js)",
26+
"d (_emscripten_runtime_keepalive_clear)",
27+
"e (_abort_js)",
28+
"f (proc_exit)",
29+
"g (fd_write)",
30+
"h (fd_seek)",
31+
"i (fd_read)",
32+
"j (fd_close)",
33+
"k (environ_sizes_get)",
34+
"l (environ_get)"
35+
],
36+
"exports": [
37+
"m (memory)",
38+
"n (__wasm_call_ctors)",
39+
"o (main)",
40+
"p (_emscripten_timeout)"
41+
]
42+
}

0 commit comments

Comments
 (0)