Skip to content

Commit f7571a4

Browse files
dcodeIOdcodeIO
authored
fix: Update Binaryen to 112.0.0-nightly.20230411 (#2683)
Emscripten lowered the default stack size of emitted modules to 64kb recently, easily producing stack overflows in the optimizer. This version of Binaryen increases stack size to the previous 5mb again.
1 parent 076d8a9 commit f7571a4

File tree

255 files changed

+8587
-8585
lines changed

Some content is hidden

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

255 files changed

+8587
-8585
lines changed

‎package-lock.json‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"engineStrict": true,
2727
"dependencies": {
28-
"binaryen": "111.0.0-nightly.20230202",
28+
"binaryen": "112.0.0-nightly.20230411",
2929
"long": "^5.2.1"
3030
},
3131
"devDependencies": {

‎src/glue/binaryen.d.ts‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -416,19 +416,19 @@ export declare function _BinaryenSIMDLoadStoreLaneGetVec(expr: ExpressionRef): E
416416
export declare function _BinaryenSIMDLoadStoreLaneSetVec(expr: ExpressionRef, vecExpr: ExpressionRef): void;
417417
export declare function _BinaryenSIMDLoadStoreLaneIsStore(expr: ExpressionRef): bool;
418418

419-
export declare function _BinaryenMemoryInit(module: ModuleRef, segmentIndex: u32, destExpr: ExpressionRef, offsetExpr: ExpressionRef, sizeExpr: ExpressionRef, memoryName: StringRef): ExpressionRef;
420-
export declare function _BinaryenMemoryInitGetSegment(expr: ExpressionRef): u32;
421-
export declare function _BinaryenMemoryInitSetSegment(expr: ExpressionRef, segmentIndex: u32): void;
419+
export declare function _BinaryenMemoryInit(module: ModuleRef, segmentName: StringRef, destExpr: ExpressionRef, offsetExpr: ExpressionRef, sizeExpr: ExpressionRef, memoryName: StringRef): ExpressionRef;
420+
export declare function _BinaryenMemoryInitGetSegment(expr: ExpressionRef): StringRef;
421+
export declare function _BinaryenMemoryInitSetSegment(expr: ExpressionRef, segmentName: StringRef): void;
422422
export declare function _BinaryenMemoryInitGetDest(expr: ExpressionRef): ExpressionRef;
423423
export declare function _BinaryenMemoryInitSetDest(expr: ExpressionRef, destExpr: ExpressionRef): void;
424424
export declare function _BinaryenMemoryInitGetOffset(expr: ExpressionRef): ExpressionRef;
425425
export declare function _BinaryenMemoryInitSetOffset(expr: ExpressionRef, offsetExpr: ExpressionRef): void;
426426
export declare function _BinaryenMemoryInitGetSize(expr: ExpressionRef): ExpressionRef;
427427
export declare function _BinaryenMemoryInitSetSize(expr: ExpressionRef, sizeExpr: ExpressionRef): void;
428428

429-
export declare function _BinaryenDataDrop(module: ModuleRef, segmentIndex: u32): ExpressionRef;
430-
export declare function _BinaryenDataDropGetSegment(expr: ExpressionRef): u32;
431-
export declare function _BinaryenDataDropSetSegment(expr: ExpressionRef, segmentIndex: u32): void;
429+
export declare function _BinaryenDataDrop(module: ModuleRef, segmentName: StringRef): ExpressionRef;
430+
export declare function _BinaryenDataDropGetSegment(expr: ExpressionRef): StringRef;
431+
export declare function _BinaryenDataDropSetSegment(expr: ExpressionRef, segmentName: StringRef): void;
432432

433433
export declare function _BinaryenMemoryCopy(module: ModuleRef, destExpr: ExpressionRef, sourceExpr: ExpressionRef, sizeExpr: ExpressionRef, destMemoryName: StringRef, sourceMemoryName: StringRef): ExpressionRef;
434434
export declare function _BinaryenMemoryCopyGetDest(expr: ExpressionRef): ExpressionRef;
@@ -620,13 +620,13 @@ export declare function _BinaryenArrayNewSetSize(expr: ExpressionRef, sizeExpr:
620620

621621
// TODO: BinaryenArrayNewSeg
622622

623-
export declare function _BinaryenArrayInit(module: ModuleRef, type: HeapTypeRef, values: ArrayRef<ExpressionRef>, numValues: Index): ExpressionRef;
624-
export declare function _BinaryenArrayInitGetNumValues(expr: ExpressionRef): Index;
625-
export declare function _BinaryenArrayInitGetValueAt(expr: ExpressionRef, index: Index): ExpressionRef;
626-
export declare function _BinaryenArrayInitSetValueAt(expr: ExpressionRef, index: Index, valueExpr: ExpressionRef): void;
627-
export declare function _BinaryenArrayInitAppendValue(expr: ExpressionRef, valueExpr: ExpressionRef): Index;
628-
export declare function _BinaryenArrayInitInsertValueAt(expr: ExpressionRef, index: Index, valueExpr: ExpressionRef): void;
629-
export declare function _BinaryenArrayInitRemoveValueAt(expr: ExpressionRef, index: Index): ExpressionRef;
623+
export declare function _BinaryenArrayNewFixed(module: ModuleRef, type: HeapTypeRef, values: ArrayRef<ExpressionRef>, numValues: Index): ExpressionRef;
624+
export declare function _BinaryenArrayNewFixedGetNumValues(expr: ExpressionRef): Index;
625+
export declare function _BinaryenArrayNewFixedGetValueAt(expr: ExpressionRef, index: Index): ExpressionRef;
626+
export declare function _BinaryenArrayNewFixedSetValueAt(expr: ExpressionRef, index: Index, valueExpr: ExpressionRef): void;
627+
export declare function _BinaryenArrayNewFixedAppendValue(expr: ExpressionRef, valueExpr: ExpressionRef): Index;
628+
export declare function _BinaryenArrayNewFixedInsertValueAt(expr: ExpressionRef, index: Index, valueExpr: ExpressionRef): void;
629+
export declare function _BinaryenArrayNewFixedRemoveValueAt(expr: ExpressionRef, index: Index): ExpressionRef;
630630

631631
export declare function _BinaryenArrayGet(module: ModuleRef, ref: ExpressionRef, index: ExpressionRef, type: TypeRef, signed: bool): ExpressionRef;
632632
export declare function _BinaryenArrayGetGetRef(expr: ExpressionRef): ExpressionRef;
@@ -660,6 +660,9 @@ export declare function _BinaryenArrayCopySetSrcIndex(expr: ExpressionRef, srcIn
660660
export declare function _BinaryenArrayCopyGetLength(expr: ExpressionRef): ExpressionRef;
661661
export declare function _BinaryenArrayCopySetLength(expr: ExpressionRef, lengthExpr: ExpressionRef): void;
662662

663+
// TODO: BinaryenArrayFill
664+
// TODO: BinaryenArrayInit
665+
663666
export declare function _BinaryenStringNew(module: ModuleRef, op: Op, ptr: ExpressionRef, length: ExpressionRef, start: ExpressionRef, end: ExpressionRef, isTry: bool): ExpressionRef;
664667
export declare function _BinaryenStringNewGetOp(expr: ExpressionRef): Op;
665668
export declare function _BinaryenStringNewSetOp(expr: ExpressionRef, op: Op): void;

‎src/glue/binaryen.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -576,13 +576,13 @@ export const {
576576
_BinaryenArrayNewGetSize,
577577
_BinaryenArrayNewSetSize,
578578

579-
_BinaryenArrayInit,
580-
_BinaryenArrayInitGetNumValues,
581-
_BinaryenArrayInitGetValueAt,
582-
_BinaryenArrayInitSetValueAt,
583-
_BinaryenArrayInitAppendValue,
584-
_BinaryenArrayInitInsertValueAt,
585-
_BinaryenArrayInitRemoveValueAt,
579+
_BinaryenArrayNewFixed,
580+
_BinaryenArrayNewFixedGetNumValues,
581+
_BinaryenArrayNewFixedGetValueAt,
582+
_BinaryenArrayNewFixedSetValueAt,
583+
_BinaryenArrayNewFixedAppendValue,
584+
_BinaryenArrayNewFixedInsertValueAt,
585+
_BinaryenArrayNewFixedRemoveValueAt,
586586

587587
_BinaryenArrayGet,
588588
_BinaryenArrayGetGetRef,

‎src/module.ts‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -298,25 +298,27 @@ export const enum ExpressionId {
298298
StructSet = 62 /* _BinaryenStructSetId */,
299299
ArrayNew = 63 /* _BinaryenArrayNewId */,
300300
ArrayNewSeg = 64 /* TODO_BinaryenArraySegId */,
301-
ArrayInit = 65 /* _BinaryenArrayInitId */,
301+
ArrayNewFixed = 65 /* _BinaryenArrayNewFixedId */,
302302
ArrayGet = 66 /* _BinaryenArrayGetId */,
303303
ArraySet = 67 /* _BinaryenArraySetId */,
304304
ArrayLen = 68 /* _BinaryenArrayLenId */,
305305
ArrayCopy = 69 /* _BinaryenArrayCopyId */,
306-
RefAs = 70 /* _BinaryenRefAsId */,
307-
StringNew = 71 /* _BinaryenStringNewId */,
308-
StringConst = 72 /* _BinaryenStringConstId */,
309-
StringMeasure = 73 /* _BinaryenStringMeasureId */,
310-
StringEncode = 74 /* _BinaryenStringEncodeId */,
311-
StringConcat = 75 /* _BinaryenStringConcatId */,
312-
StringEq = 76 /* _BinaryenStringEqId */,
313-
StringAs = 77 /* _BinaryenStringAsId */,
314-
StringWTF8Advance = 78 /* _BinaryenStringWTF8AdvanceId */,
315-
StringWTF16Get = 79 /* _BinaryenStringWTF16GetId */,
316-
StringIterNext = 80 /* _BinaryenStringIterNextId */,
317-
StringIterMove = 81 /* _BinaryenStringIterMoveId */,
318-
StringSliceWTF = 82 /* _BinaryenStringSliceWTFId */,
319-
StringSliceIter = 83 /* _BinaryenStringSliceIterId */
306+
ArrayFill = 70 /* _BinaryenArrayFillId */,
307+
ArrayInit = 71 /* _BinaryenArrayInitId */,
308+
RefAs = 72 /* _BinaryenRefAsId */,
309+
StringNew = 73 /* _BinaryenStringNewId */,
310+
StringConst = 74 /* _BinaryenStringConstId */,
311+
StringMeasure = 75 /* _BinaryenStringMeasureId */,
312+
StringEncode = 76 /* _BinaryenStringEncodeId */,
313+
StringConcat = 77 /* _BinaryenStringConcatId */,
314+
StringEq = 78 /* _BinaryenStringEqId */,
315+
StringAs = 79 /* _BinaryenStringAsId */,
316+
StringWTF8Advance = 80 /* _BinaryenStringWTF8AdvanceId */,
317+
StringWTF16Get = 81 /* _BinaryenStringWTF16GetId */,
318+
StringIterNext = 82 /* _BinaryenStringIterNextId */,
319+
StringIterMove = 83 /* _BinaryenStringIterMoveId */,
320+
StringSliceWTF = 84 /* _BinaryenStringSliceWTFId */,
321+
StringSliceIter = 85 /* _BinaryenStringSliceIterId */
320322
}
321323

322324
/** Binaryen external kind constants. */

‎src/passes/pass.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ import {
195195
_BinaryenStructGetGetIndex,
196196
_BinaryenArrayNewGetSize,
197197
_BinaryenArrayNewGetInit,
198-
_BinaryenArrayInitGetNumValues,
199-
_BinaryenArrayInitGetValueAt,
198+
_BinaryenArrayNewFixedGetNumValues,
199+
_BinaryenArrayNewFixedGetValueAt,
200200
_BinaryenArrayGetGetRef,
201201
_BinaryenArrayGetGetIndex,
202202
_BinaryenArraySetGetRef,
@@ -283,7 +283,7 @@ import {
283283
_BinaryenStringSliceWTFSetEnd,
284284
_BinaryenStringSliceIterSetRef,
285285
_BinaryenStringSliceIterSetNum,
286-
_BinaryenArrayInitSetValueAt
286+
_BinaryenArrayNewFixedSetValueAt
287287
} from "../glue/binaryen";
288288

289289
/** Base class of custom Binaryen visitors. */
@@ -552,7 +552,7 @@ export abstract class Visitor {
552552
// unimp
553553
}
554554

555-
visitArrayInit(expr: ExpressionRef): void {
555+
visitArrayNewFixed(expr: ExpressionRef): void {
556556
// unimp
557557
}
558558

@@ -1127,16 +1127,16 @@ export abstract class Visitor {
11271127
this.visitArrayNew(expr);
11281128
break;
11291129
}
1130-
case ExpressionId.ArrayInit: {
1131-
let numValues = _BinaryenArrayInitGetNumValues(expr);
1130+
case ExpressionId.ArrayNewFixed: {
1131+
let numValues = _BinaryenArrayNewFixedGetNumValues(expr);
11321132
if (numValues) {
11331133
this.stack.push(expr);
11341134
for (let i: Index = 0; i < numValues; ++i) {
1135-
this.visit(_BinaryenArrayInitGetValueAt(expr, i));
1135+
this.visit(_BinaryenArrayNewFixedGetValueAt(expr, i));
11361136
}
11371137
assert(this.stack.pop() == expr);
11381138
}
1139-
this.visitArrayInit(expr);
1139+
this.visitArrayNewFixed(expr);
11401140
break;
11411141
}
11421142
case ExpressionId.ArrayGet: {
@@ -1985,12 +1985,12 @@ export function replaceChild(
19851985
}
19861986
break;
19871987
}
1988-
case ExpressionId.ArrayInit: {
1989-
let numValues = _BinaryenArrayInitGetNumValues(parent);
1988+
case ExpressionId.ArrayNewFixed: {
1989+
let numValues = _BinaryenArrayNewFixedGetNumValues(parent);
19901990
for (let i: Index = 0; i < numValues; ++i) {
1991-
let value = _BinaryenArrayInitGetValueAt(parent, i);
1991+
let value = _BinaryenArrayNewFixedGetValueAt(parent, i);
19921992
if (value == search) {
1993-
_BinaryenArrayInitSetValueAt(parent, i, replacement);
1993+
_BinaryenArrayNewFixedSetValueAt(parent, i, replacement);
19941994
return value;
19951995
}
19961996
}

‎tests/compiler/NonNullable.debug.wat‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
(global $~lib/memory/__stack_pointer (mut i32) (i32.const 33132))
1616
(global $~lib/memory/__heap_base i32 (i32.const 33132))
1717
(memory $0 1)
18-
(data (i32.const 12) "\1c\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\06\00\00\00u\003\002\00\00\00\00\00\00\00")
19-
(data (i32.const 44) ",\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\1c\00\00\00N\00o\00n\00N\00u\00l\00l\00a\00b\00l\00e\00.\00t\00s\00")
20-
(data (i32.const 92) "\1c\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\0c\00\00\00S\00t\00r\00i\00n\00g\00")
21-
(data (i32.const 124) "L\00\00\00\00\00\00\00\00\00\00\00\02\00\00\002\00\00\00A\00r\00r\00a\00y\00<\00~\00l\00i\00b\00/\00s\00t\00r\00i\00n\00g\00/\00S\00t\00r\00i\00n\00g\00>\00\00\00\00\00\00\00\00\00\00\00")
22-
(data (i32.const 204) "\1c\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\02\00\00\00z\00\00\00\00\00\00\00\00\00\00\00")
23-
(data (i32.const 236) "|\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00^\00\00\00U\00n\00e\00x\00p\00e\00c\00t\00e\00d\00 \00\'\00n\00u\00l\00l\00\'\00 \00(\00n\00o\00t\00 \00a\00s\00s\00i\00g\00n\00e\00d\00 \00o\00r\00 \00f\00a\00i\00l\00e\00d\00 \00c\00a\00s\00t\00)\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00")
18+
(data $0 (i32.const 12) "\1c\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\06\00\00\00u\003\002\00\00\00\00\00\00\00")
19+
(data $1 (i32.const 44) ",\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\1c\00\00\00N\00o\00n\00N\00u\00l\00l\00a\00b\00l\00e\00.\00t\00s\00")
20+
(data $2 (i32.const 92) "\1c\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\0c\00\00\00S\00t\00r\00i\00n\00g\00")
21+
(data $3 (i32.const 124) "L\00\00\00\00\00\00\00\00\00\00\00\02\00\00\002\00\00\00A\00r\00r\00a\00y\00<\00~\00l\00i\00b\00/\00s\00t\00r\00i\00n\00g\00/\00S\00t\00r\00i\00n\00g\00>\00\00\00\00\00\00\00\00\00\00\00")
22+
(data $4 (i32.const 204) "\1c\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\02\00\00\00z\00\00\00\00\00\00\00\00\00\00\00")
23+
(data $5 (i32.const 236) "|\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00^\00\00\00U\00n\00e\00x\00p\00e\00c\00t\00e\00d\00 \00\'\00n\00u\00l\00l\00\'\00 \00(\00n\00o\00t\00 \00a\00s\00s\00i\00g\00n\00e\00d\00 \00o\00r\00 \00f\00a\00i\00l\00e\00d\00 \00c\00a\00s\00t\00)\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00")
2424
(table $0 1 1 funcref)
2525
(elem $0 (i32.const 1))
2626
(export "memory" (memory $0))

‎tests/compiler/NonNullable.release.wat‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
(import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
77
(global $~lib/memory/__stack_pointer (mut i32) (i32.const 34156))
88
(memory $0 1)
9-
(data (i32.const 1036) "\1c")
10-
(data (i32.const 1048) "\02\00\00\00\06\00\00\00u\003\002")
11-
(data (i32.const 1068) ",")
12-
(data (i32.const 1080) "\02\00\00\00\1c\00\00\00N\00o\00n\00N\00u\00l\00l\00a\00b\00l\00e\00.\00t\00s")
13-
(data (i32.const 1116) "\1c")
14-
(data (i32.const 1128) "\02\00\00\00\0c\00\00\00S\00t\00r\00i\00n\00g")
15-
(data (i32.const 1148) "L")
16-
(data (i32.const 1160) "\02\00\00\002\00\00\00A\00r\00r\00a\00y\00<\00~\00l\00i\00b\00/\00s\00t\00r\00i\00n\00g\00/\00S\00t\00r\00i\00n\00g\00>")
17-
(data (i32.const 1228) "\1c")
18-
(data (i32.const 1240) "\02\00\00\00\02\00\00\00z")
19-
(data (i32.const 1260) "|")
20-
(data (i32.const 1272) "\02\00\00\00^\00\00\00U\00n\00e\00x\00p\00e\00c\00t\00e\00d\00 \00\'\00n\00u\00l\00l\00\'\00 \00(\00n\00o\00t\00 \00a\00s\00s\00i\00g\00n\00e\00d\00 \00o\00r\00 \00f\00a\00i\00l\00e\00d\00 \00c\00a\00s\00t\00)")
9+
(data $0 (i32.const 1036) "\1c")
10+
(data $0.1 (i32.const 1048) "\02\00\00\00\06\00\00\00u\003\002")
11+
(data $1 (i32.const 1068) ",")
12+
(data $1.1 (i32.const 1080) "\02\00\00\00\1c\00\00\00N\00o\00n\00N\00u\00l\00l\00a\00b\00l\00e\00.\00t\00s")
13+
(data $2 (i32.const 1116) "\1c")
14+
(data $2.1 (i32.const 1128) "\02\00\00\00\0c\00\00\00S\00t\00r\00i\00n\00g")
15+
(data $3 (i32.const 1148) "L")
16+
(data $3.1 (i32.const 1160) "\02\00\00\002\00\00\00A\00r\00r\00a\00y\00<\00~\00l\00i\00b\00/\00s\00t\00r\00i\00n\00g\00/\00S\00t\00r\00i\00n\00g\00>")
17+
(data $4 (i32.const 1228) "\1c")
18+
(data $4.1 (i32.const 1240) "\02\00\00\00\02\00\00\00z")
19+
(data $5 (i32.const 1260) "|")
20+
(data $5.1 (i32.const 1272) "\02\00\00\00^\00\00\00U\00n\00e\00x\00p\00e\00c\00t\00e\00d\00 \00\'\00n\00u\00l\00l\00\'\00 \00(\00n\00o\00t\00 \00a\00s\00s\00i\00g\00n\00e\00d\00 \00o\00r\00 \00f\00a\00i\00l\00e\00d\00 \00c\00a\00s\00t\00)")
2121
(export "memory" (memory $0))
2222
(start $~start)
2323
(func $~start

‎tests/compiler/abi.debug.wat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
(global $~lib/memory/__stack_pointer (mut i32) (i32.const 32812))
1010
(global $~lib/memory/__heap_base i32 (i32.const 32812))
1111
(memory $0 1)
12-
(data (i32.const 12) "\1c\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\0c\00\00\00a\00b\00i\00.\00t\00s\00")
12+
(data $0 (i32.const 12) "\1c\00\00\00\00\00\00\00\00\00\00\00\02\00\00\00\0c\00\00\00a\00b\00i\00.\00t\00s\00")
1313
(table $0 1 1 funcref)
1414
(elem $0 (i32.const 1))
1515
(export "exported" (func $abi/exported))

‎tests/compiler/abi.release.wat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
(module
22
(type $none_=>_i32 (func (result i32)))
33
(memory $0 1)
4-
(data (i32.const 1036) "\1c")
5-
(data (i32.const 1048) "\02\00\00\00\0c\00\00\00a\00b\00i\00.\00t\00s")
4+
(data $0 (i32.const 1036) "\1c")
5+
(data $0.1 (i32.const 1048) "\02\00\00\00\0c\00\00\00a\00b\00i\00.\00t\00s")
66
(export "exported" (func $abi/exported))
77
(export "exportedExported" (func $abi/exported))
88
(export "exportedInternal" (func $abi/exported))

0 commit comments

Comments
 (0)