Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Binaryen #2637

Merged
merged 2 commits into from Feb 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -25,7 +25,7 @@
},
"engineStrict": true,
"dependencies": {
"binaryen": "111.0.0-nightly.20230111",
"binaryen": "111.0.0-nightly.20230202",
"long": "^5.2.0"
},
"devDependencies": {
Expand Down
8 changes: 6 additions & 2 deletions src/glue/binaryen.d.ts
Expand Up @@ -660,7 +660,7 @@ export declare function _BinaryenArrayCopySetSrcIndex(expr: ExpressionRef, srcIn
export declare function _BinaryenArrayCopyGetLength(expr: ExpressionRef): ExpressionRef;
export declare function _BinaryenArrayCopySetLength(expr: ExpressionRef, lengthExpr: ExpressionRef): void;

export declare function _BinaryenStringNew(module: ModuleRef, op: Op, ptr: ExpressionRef, length: ExpressionRef, start: ExpressionRef, end: ExpressionRef): ExpressionRef;
export declare function _BinaryenStringNew(module: ModuleRef, op: Op, ptr: ExpressionRef, length: ExpressionRef, start: ExpressionRef, end: ExpressionRef, isTry: bool): ExpressionRef;
export declare function _BinaryenStringNewGetOp(expr: ExpressionRef): Op;
export declare function _BinaryenStringNewSetOp(expr: ExpressionRef, op: Op): void;
export declare function _BinaryenStringNewGetPtr(expr: ExpressionRef): ExpressionRef;
Expand All @@ -671,6 +671,8 @@ export declare function _BinaryenStringNewGetStart(expr: ExpressionRef): Express
export declare function _BinaryenStringNewSetStart(expr: ExpressionRef, startExpr: ExpressionRef): void;
export declare function _BinaryenStringNewGetEnd(expr: ExpressionRef): ExpressionRef;
export declare function _BinaryenStringNewSetEnd(expr: ExpressionRef, endExpr: ExpressionRef): void;
export declare function _BinaryenStringNewIsTry(expr: ExpressionRef): bool;
export declare function _BinaryenStringNewSetTry(expr: ExpressionRef, isTry: bool): void;

export declare function _BinaryenStringConst(module: ExpressionRef, name: StringRef): ExpressionRef;
export declare function _BinaryenStringConstGetString(expr: ExpressionRef): StringRef;
Expand Down Expand Up @@ -698,7 +700,9 @@ export declare function _BinaryenStringConcatSetLeft(expr: ExpressionRef, leftEx
export declare function _BinaryenStringConcatGetRight(expr: ExpressionRef): ExpressionRef;
export declare function _BinaryenStringConcatSetRight(expr: ExpressionRef, rightExpr: ExpressionRef): void;

export declare function _BinaryenStringEq(module: ExpressionRef, left: ExpressionRef, right: ExpressionRef): ExpressionRef;
export declare function _BinaryenStringEq(module: ExpressionRef, op: Op, left: ExpressionRef, right: ExpressionRef): ExpressionRef;
export declare function _BinaryenStringEqGetOp(expr: ExpressionRef): Op;
export declare function _BinaryenStringEqSetOp(expr: ExpressionRef, op: Op): void;
export declare function _BinaryenStringEqGetLeft(expr: ExpressionRef): ExpressionRef;
export declare function _BinaryenStringEqSetLeft(expr: ExpressionRef, leftExpr: ExpressionRef): void;
export declare function _BinaryenStringEqGetRight(expr: ExpressionRef): ExpressionRef;
Expand Down
4 changes: 4 additions & 0 deletions src/glue/binaryen.js
Expand Up @@ -627,6 +627,8 @@ export const {
_BinaryenStringNewSetStart,
_BinaryenStringNewGetEnd,
_BinaryenStringNewSetEnd,
_BinaryenStringNewIsTry,
_BinaryenStringNewSetTry,

_BinaryenStringConst,
_BinaryenStringConstGetString,
Expand Down Expand Up @@ -655,6 +657,8 @@ export const {
_BinaryenStringConcatSetRight,

_BinaryenStringEq,
_BinaryenStringEqGetOp,
_BinaryenStringEqSetOp,
_BinaryenStringEqGetLeft,
_BinaryenStringEqSetLeft,
_BinaryenStringEqGetRight,
Expand Down
18 changes: 16 additions & 2 deletions src/module.ts
Expand Up @@ -1231,7 +1231,9 @@ export const enum StringNewOp {
/** string.new_wtf8_array replace */
ReplaceArray = 6 /* _BinaryenStringNewReplaceArray */,
/** string.new_wtf16_array */
WTF16Array = 7 /* _BinaryenStringNewWTF16Array */
WTF16Array = 7 /* _BinaryenStringNewWTF16Array */,
/** string.from_code_point */
FromCodePoint = 8 /* _BinaryenStringNewFromCodePoint */
}

/** Binaryen StringMeasure operation constants. */
Expand Down Expand Up @@ -1264,6 +1266,14 @@ export const enum StringEncodeOp {
WTF16Array = 5 /* _BinaryenStringEncodeWTF16Array */
}

/** Binaryen StringEq operation constants. */
export const enum StringEqOp {
/** string.eq */
Equal = 0 /* _BinaryenStringEqEqual */,
/** string.compare */
Compare = 1 /* _BinaryenStringEqCompare */
}

/** Binaryen StringAs operation constants. */
export const enum StringAsOp {
/** string.as_wtf8 */
Expand Down Expand Up @@ -1412,7 +1422,11 @@ export class Module {
}

string_eq(left: ExpressionRef, right: ExpressionRef): ExpressionRef {
return binaryen._BinaryenStringEq(this.ref, left, right);
return binaryen._BinaryenStringEq(this.ref, StringEqOp.Equal, left, right);
}

string_compare(left: ExpressionRef, right: ExpressionRef): ExpressionRef {
return binaryen._BinaryenStringEq(this.ref, StringEqOp.Compare, left, right);
}

// expressions
Expand Down