Skip to content

Commit 810b8e6

Browse files
authoredFeb 2, 2023
Update Binaryen (#2637)
1 parent 5cbbf84 commit 810b8e6

File tree

5 files changed

+34
-12
lines changed

5 files changed

+34
-12
lines changed
 

‎package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"engineStrict": true,
2727
"dependencies": {
28-
"binaryen": "111.0.0-nightly.20230111",
28+
"binaryen": "111.0.0-nightly.20230202",
2929
"long": "^5.2.0"
3030
},
3131
"devDependencies": {

‎src/glue/binaryen.d.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ 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-
export declare function _BinaryenStringNew(module: ModuleRef, op: Op, ptr: ExpressionRef, length: ExpressionRef, start: ExpressionRef, end: ExpressionRef): ExpressionRef;
663+
export declare function _BinaryenStringNew(module: ModuleRef, op: Op, ptr: ExpressionRef, length: ExpressionRef, start: ExpressionRef, end: ExpressionRef, isTry: bool): ExpressionRef;
664664
export declare function _BinaryenStringNewGetOp(expr: ExpressionRef): Op;
665665
export declare function _BinaryenStringNewSetOp(expr: ExpressionRef, op: Op): void;
666666
export declare function _BinaryenStringNewGetPtr(expr: ExpressionRef): ExpressionRef;
@@ -671,6 +671,8 @@ export declare function _BinaryenStringNewGetStart(expr: ExpressionRef): Express
671671
export declare function _BinaryenStringNewSetStart(expr: ExpressionRef, startExpr: ExpressionRef): void;
672672
export declare function _BinaryenStringNewGetEnd(expr: ExpressionRef): ExpressionRef;
673673
export declare function _BinaryenStringNewSetEnd(expr: ExpressionRef, endExpr: ExpressionRef): void;
674+
export declare function _BinaryenStringNewIsTry(expr: ExpressionRef): bool;
675+
export declare function _BinaryenStringNewSetTry(expr: ExpressionRef, isTry: bool): void;
674676

675677
export declare function _BinaryenStringConst(module: ExpressionRef, name: StringRef): ExpressionRef;
676678
export declare function _BinaryenStringConstGetString(expr: ExpressionRef): StringRef;
@@ -698,7 +700,9 @@ export declare function _BinaryenStringConcatSetLeft(expr: ExpressionRef, leftEx
698700
export declare function _BinaryenStringConcatGetRight(expr: ExpressionRef): ExpressionRef;
699701
export declare function _BinaryenStringConcatSetRight(expr: ExpressionRef, rightExpr: ExpressionRef): void;
700702

701-
export declare function _BinaryenStringEq(module: ExpressionRef, left: ExpressionRef, right: ExpressionRef): ExpressionRef;
703+
export declare function _BinaryenStringEq(module: ExpressionRef, op: Op, left: ExpressionRef, right: ExpressionRef): ExpressionRef;
704+
export declare function _BinaryenStringEqGetOp(expr: ExpressionRef): Op;
705+
export declare function _BinaryenStringEqSetOp(expr: ExpressionRef, op: Op): void;
702706
export declare function _BinaryenStringEqGetLeft(expr: ExpressionRef): ExpressionRef;
703707
export declare function _BinaryenStringEqSetLeft(expr: ExpressionRef, leftExpr: ExpressionRef): void;
704708
export declare function _BinaryenStringEqGetRight(expr: ExpressionRef): ExpressionRef;

‎src/glue/binaryen.js

+4
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,8 @@ export const {
627627
_BinaryenStringNewSetStart,
628628
_BinaryenStringNewGetEnd,
629629
_BinaryenStringNewSetEnd,
630+
_BinaryenStringNewIsTry,
631+
_BinaryenStringNewSetTry,
630632

631633
_BinaryenStringConst,
632634
_BinaryenStringConstGetString,
@@ -655,6 +657,8 @@ export const {
655657
_BinaryenStringConcatSetRight,
656658

657659
_BinaryenStringEq,
660+
_BinaryenStringEqGetOp,
661+
_BinaryenStringEqSetOp,
658662
_BinaryenStringEqGetLeft,
659663
_BinaryenStringEqSetLeft,
660664
_BinaryenStringEqGetRight,

‎src/module.ts

+16-2
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,9 @@ export const enum StringNewOp {
12311231
/** string.new_wtf8_array replace */
12321232
ReplaceArray = 6 /* _BinaryenStringNewReplaceArray */,
12331233
/** string.new_wtf16_array */
1234-
WTF16Array = 7 /* _BinaryenStringNewWTF16Array */
1234+
WTF16Array = 7 /* _BinaryenStringNewWTF16Array */,
1235+
/** string.from_code_point */
1236+
FromCodePoint = 8 /* _BinaryenStringNewFromCodePoint */
12351237
}
12361238

12371239
/** Binaryen StringMeasure operation constants. */
@@ -1264,6 +1266,14 @@ export const enum StringEncodeOp {
12641266
WTF16Array = 5 /* _BinaryenStringEncodeWTF16Array */
12651267
}
12661268

1269+
/** Binaryen StringEq operation constants. */
1270+
export const enum StringEqOp {
1271+
/** string.eq */
1272+
Equal = 0 /* _BinaryenStringEqEqual */,
1273+
/** string.compare */
1274+
Compare = 1 /* _BinaryenStringEqCompare */
1275+
}
1276+
12671277
/** Binaryen StringAs operation constants. */
12681278
export const enum StringAsOp {
12691279
/** string.as_wtf8 */
@@ -1412,7 +1422,11 @@ export class Module {
14121422
}
14131423

14141424
string_eq(left: ExpressionRef, right: ExpressionRef): ExpressionRef {
1415-
return binaryen._BinaryenStringEq(this.ref, left, right);
1425+
return binaryen._BinaryenStringEq(this.ref, StringEqOp.Equal, left, right);
1426+
}
1427+
1428+
string_compare(left: ExpressionRef, right: ExpressionRef): ExpressionRef {
1429+
return binaryen._BinaryenStringEq(this.ref, StringEqOp.Compare, left, right);
14161430
}
14171431

14181432
// expressions

0 commit comments

Comments
 (0)
Please sign in to comment.