Skip to content

Commit 91c0d75

Browse files
committed
Don't force the use of imported memory under WASM2JS
Setting `IMPORTED_MEMORY` can have other implications and don't want t by default just because we chose WASM2JS. See #21071
1 parent 72c3be3 commit 91c0d75

13 files changed

+94
-111
lines changed

test/code_size/embind_val_wasm.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 673,
33
"a.html.gz": 431,
4-
"a.js": 7411,
5-
"a.js.gz": 3140,
4+
"a.js": 7387,
5+
"a.js.gz": 3112,
66
"a.wasm": 11433,
77
"a.wasm.gz": 5725,
8-
"total": 19517,
9-
"total_gz": 9296
8+
"total": 19493,
9+
"total_gz": 9268
1010
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 737,
33
"a.html.gz": 433,
4-
"a.js": 667,
5-
"a.js.gz": 458,
4+
"a.js": 665,
5+
"a.js.gz": 455,
66
"a.wasm": 1852,
77
"a.wasm.gz": 1049,
8-
"total": 3256,
9-
"total_gz": 1940
8+
"total": 3254,
9+
"total_gz": 1937
1010
}

test/code_size/hello_webgl2_wasm.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 569,
33
"a.html.gz": 379,
4-
"a.js": 4681,
5-
"a.js.gz": 2412,
4+
"a.js": 4671,
5+
"a.js.gz": 2396,
66
"a.wasm": 10388,
77
"a.wasm.gz": 6692,
8-
"total": 15638,
9-
"total_gz": 9483
8+
"total": 15628,
9+
"total_gz": 9467
1010
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 567,
33
"a.html.gz": 379,
4-
"a.js": 17917,
5-
"a.js.gz": 8089,
4+
"a.js": 17766,
5+
"a.js.gz": 7996,
66
"a.mem": 3123,
77
"a.mem.gz": 2693,
8-
"total": 21607,
9-
"total_gz": 11161
8+
"total": 21456,
9+
"total_gz": 11068
1010
}

test/code_size/hello_webgl_wasm.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 569,
33
"a.html.gz": 379,
4-
"a.js": 4167,
5-
"a.js.gz": 2236,
4+
"a.js": 4158,
5+
"a.js.gz": 2220,
66
"a.wasm": 10388,
77
"a.wasm.gz": 6692,
8-
"total": 15124,
9-
"total_gz": 9307
8+
"total": 15115,
9+
"total_gz": 9291
1010
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 567,
33
"a.html.gz": 379,
4-
"a.js": 17395,
5-
"a.js.gz": 7900,
4+
"a.js": 17239,
5+
"a.js.gz": 7827,
66
"a.mem": 3123,
77
"a.mem.gz": 2693,
8-
"total": 21085,
9-
"total_gz": 10972
8+
"total": 20929,
9+
"total_gz": 10899
1010
}

test/code_size/hello_world_wasm.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 673,
33
"a.html.gz": 431,
4-
"a.js": 292,
5-
"a.js.gz": 252,
4+
"a.js": 291,
5+
"a.js.gz": 249,
66
"a.wasm": 103,
77
"a.wasm.gz": 112,
8-
"total": 1068,
9-
"total_gz": 795
8+
"total": 1067,
9+
"total_gz": 792
1010
}

test/code_size/hello_world_wasm2js.js

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,64 @@
1-
var b = Module, g = new function(a) {
2-
this.buffer = new ArrayBuffer(65536 * a.initial);
3-
}({
4-
initial: 256,
5-
maximum: 256
6-
}), k = g.buffer, d = new Uint8Array(k), l = new TextDecoder("utf8"), m;
1+
var c = Module, g, h, k = new TextDecoder("utf8"), l;
72

8-
function c(a) {
9-
this.exports = function(h) {
10-
function n(f) {
11-
f.set = function(e, p) {
12-
this[e] = p;
3+
function d(b) {
4+
this.exports = function(f) {
5+
function m(e) {
6+
e.set = function(a, n) {
7+
this[a] = n;
138
};
14-
f.get = function(e) {
15-
return this[e];
9+
e.get = function(a) {
10+
return this[a];
1611
};
17-
return f;
12+
return e;
1813
}
19-
return function(f) {
20-
var e = f.a.a;
14+
return function(e) {
15+
var a = new ArrayBuffer(16777216), n = e.a.a;
16+
e = m([]);
2117
return {
22-
b: function() {},
23-
c: function(p, q) {
24-
e(1024);
18+
b: Object.create(Object.prototype, {
19+
grow: {},
20+
buffer: {
21+
get: function() {
22+
return a;
23+
}
24+
}
25+
}),
26+
c: function() {},
27+
d: function(p, q) {
28+
n(1024);
2529
return 0;
2630
},
27-
d: n([])
31+
e: e
2832
};
29-
}(h);
30-
}(a);
33+
}(f);
34+
}(b);
3135
}
3236

33-
(function(a, h) {
37+
(function(b, f) {
3438
return {
35-
then: function(n) {
36-
n({
37-
instance: new c(h)
39+
then: function(m) {
40+
m({
41+
instance: new d(f)
3842
});
3943
}
4044
};
41-
})(b.wasm, {
45+
})(c.wasm, {
4246
a: {
43-
a: a => {
44-
var h = console, n = h.log;
45-
if (a) {
46-
for (var f = a + void 0, e = a; !(e >= f) && d[e]; ) ++e;
47-
a = l.decode(d.subarray(a, e));
48-
} else a = "";
49-
n.call(h, a);
50-
},
51-
memory: g
47+
a: b => {
48+
var f = console, m = f.log;
49+
if (b) {
50+
for (var e = b + void 0, a = b; !(a >= e) && g[a]; ) ++a;
51+
b = k.decode(g.subarray(b, a));
52+
} else b = "";
53+
m.call(f, b);
54+
}
5255
}
53-
}).then((a => {
54-
a = a.instance.exports;
55-
m = a.c;
56-
d.set(new Uint8Array(b.mem), 1024);
57-
a.b();
58-
m();
56+
}).then((b => {
57+
b = b.instance.exports;
58+
l = b.d;
59+
h = b.b;
60+
g = new Uint8Array(h.buffer);
61+
g.set(new Uint8Array(c.mem), 1024);
62+
b.c();
63+
l();
5964
}));
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 671,
33
"a.html.gz": 430,
4-
"a.js": 694,
5-
"a.js.gz": 433,
4+
"a.js": 708,
5+
"a.js.gz": 444,
66
"a.mem": 6,
77
"a.mem.gz": 32,
8-
"total": 1371,
9-
"total_gz": 895
8+
"total": 1385,
9+
"total_gz": 906
1010
}

test/code_size/math_wasm.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"a.html": 673,
33
"a.html.gz": 431,
4-
"a.js": 111,
5-
"a.js.gz": 127,
4+
"a.js": 110,
5+
"a.js.gz": 125,
66
"a.wasm": 2728,
77
"a.wasm.gz": 1672,
8-
"total": 3512,
9-
"total_gz": 2230
8+
"total": 3511,
9+
"total_gz": 2228
1010
}

0 commit comments

Comments
 (0)