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.

Sign up for GitHub

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

deps: update binaryen to version_116 #2777

Merged
merged 3 commits into from
Nov 3, 2023
Merged

deps: update binaryen to version_116 #2777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13813b5
build: update binaryen to version_116
HerrCai0907 Nov 1, 2023
72c2d34
fix math release
HerrCai0907 Nov 2, 2023
8503138
update constant
HerrCai0907 Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
38 changes: 19 additions & 19 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"engineStrict": true,
"dependencies": {
"binaryen": "112.0.0-nightly.20230411",
"binaryen": "116.0.0-nightly.20231102",
"long": "^5.2.1"
},
"devDependencies": {
Expand Down
15 changes: 5 additions & 10 deletions src/glue/binaryen.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export type ExpressionRunnerRef = Ref;
export type BinaryenModuleAllocateAndWriteResultRef = Ref;
export type TypeBuilderRef = Ref;
export type TypeBuilderErrorReason = u32;
export type TypeSystem = u32;

export declare function _BinaryenTypeCreate(types: ArrayRef<TypeRef>, numTypes: u32): TypeRef;
export declare function _BinaryenTypeArity(type: TypeRef): u32;
Expand Down Expand Up @@ -546,9 +545,9 @@ export declare function _BinaryenTupleExtractSetIndex(expr: ExpressionRef, index

export declare function _BinaryenPop(module: ModuleRef, type: TypeRef): ExpressionRef;

export declare function _BinaryenI31New(module: ModuleRef, value: ExpressionRef): ExpressionRef;
export declare function _BinaryenI31NewGetValue(expr: ExpressionRef): ExpressionRef;
export declare function _BinaryenI31NewSetValue(expr: ExpressionRef, valueExpr: ExpressionRef): void;
export declare function _BinaryenRefI31(module: ModuleRef, value: ExpressionRef): ExpressionRef;
export declare function _BinaryenRefI31GetValue(expr: ExpressionRef): ExpressionRef;
export declare function _BinaryenRefI31SetValue(expr: ExpressionRef, valueExpr: ExpressionRef): void;

export declare function _BinaryenI31Get(module: ModuleRef, i31Expr: ExpressionRef, signed: bool): ExpressionRef;
export declare function _BinaryenI31GetGetI31(expr: ExpressionRef): ExpressionRef;
Expand Down Expand Up @@ -661,7 +660,7 @@ export declare function _BinaryenArrayCopyGetLength(expr: ExpressionRef): Expres
export declare function _BinaryenArrayCopySetLength(expr: ExpressionRef, lengthExpr: ExpressionRef): void;

// TODO: BinaryenArrayFill
// TODO: BinaryenArrayInit
// TODO: BinaryenArrayNewFixed

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;
Expand Down Expand Up @@ -884,16 +883,14 @@ export declare function _ExpressionRunnerRunAndDispose(runner: ExpressionRunnerR
export declare function _TypeBuilderCreate(size: Index): TypeBuilderRef;
export declare function _TypeBuilderGrow(builder: TypeBuilderRef, count: Index): void;
export declare function _TypeBuilderGetSize(builder: TypeBuilderRef): Index;
export declare function _TypeBuilderSetBasicHeapType(builder: TypeBuilderRef, index: Index, basicHeapType: HeapTypeRef): void;
export declare function _TypeBuilderSetSignatureType(builder: TypeBuilderRef, index: Index, paramTypes: TypeRef, resultTypes: TypeRef): void;
export declare function _TypeBuilderSetStructType(builder: TypeBuilderRef, index: Index, fieldTypes: ArrayRef<TypeRef>, fieldPackedTypes: ArrayRef<PackedType>, fieldMutables: ArrayRef<bool>, numFields: i32): void;
export declare function _TypeBuilderSetArrayType(builder: TypeBuilderRef, index: Index, elementType: TypeRef, elementPackedTyype: PackedType, elementMutable: bool): void;
export declare function _TypeBuilderIsBasic(builder: TypeBuilderRef, index: Index): bool;
export declare function _TypeBuilderGetBasic(builder: TypeBuilderRef, index: Index): HeapTypeRef;
export declare function _TypeBuilderGetTempHeapType(builder: TypeBuilderRef, index: Index): HeapTypeRef;
export declare function _TypeBuilderGetTempTupleType(builder: TypeBuilderRef, types: ArrayRef<TypeRef>, numTypes: Index): TypeRef;
export declare function _TypeBuilderGetTempRefType(builder: TypeBuilderRef, heapType: HeapTypeRef, nullable: bool): TypeRef;
export declare function _TypeBuilderSetSubType(builder: TypeBuilderRef, index: Index, superType: HeapTypeRef): void;
export declare function _TypeBuilderSetOpen(builder: TypeBuilderRef, index: Index): void;
export declare function _TypeBuilderCreateRecGroup(builder: TypeBuilderRef, index: Index, length: Index): void;
export declare function _TypeBuilderBuildAndDispose(builder: TypeBuilderRef, heapTypes: ArrayRef<HeapTypeRef>, errorIndex: Pointer<Index>, errorReason: Pointer<TypeBuilderErrorReason>): bool;
export declare function _BinaryenModuleSetTypeName(module: ModuleRef, heapType: HeapTypeRef, name: StringRef): void;
Expand Down Expand Up @@ -922,8 +919,6 @@ export declare function _BinaryenGetOneCallerInlineMaxSize(): Index;
export declare function _BinaryenSetOneCallerInlineMaxSize(size: Index): void;
export declare function _BinaryenGetAllowInliningFunctionsWithLoops(): bool;
export declare function _BinaryenSetAllowInliningFunctionsWithLoops(enabled: bool): void;
export declare function _BinaryenGetTypeSystem(): TypeSystem;
export declare function _BinaryenSetTypeSystem(typeSystem: TypeSystem): void;

// Helpers

Expand Down
12 changes: 4 additions & 8 deletions src/glue/binaryen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,9 +504,9 @@ export const {

_BinaryenPop,

_BinaryenI31New,
_BinaryenI31NewGetValue,
_BinaryenI31NewSetValue,
_BinaryenRefI31,
_BinaryenRefI31GetValue,
_BinaryenRefI31SetValue,

_BinaryenI31Get,
_BinaryenI31GetGetI31,
Expand Down Expand Up @@ -837,16 +837,14 @@ export const {
_TypeBuilderCreate,
_TypeBuilderGrow,
_TypeBuilderGetSize,
_TypeBuilderSetBasicHeapType,
_TypeBuilderSetSignatureType,
_TypeBuilderSetStructType,
_TypeBuilderSetArrayType,
_TypeBuilderIsBasic,
_TypeBuilderGetBasic,
_TypeBuilderGetTempHeapType,
_TypeBuilderGetTempTupleType,
_TypeBuilderGetTempRefType,
_TypeBuilderSetSubType,
_TypeBuilderSetOpen,
_TypeBuilderCreateRecGroup,
_TypeBuilderBuildAndDispose,
_BinaryenModuleSetTypeName,
Expand Down Expand Up @@ -875,8 +873,6 @@ export const {
_BinaryenSetOneCallerInlineMaxSize,
_BinaryenGetAllowInliningFunctionsWithLoops,
_BinaryenSetAllowInliningFunctionsWithLoops,
_BinaryenGetTypeSystem,
_BinaryenSetTypeSystem,

// Helpers

Expand Down
114 changes: 55 additions & 59 deletions src/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,6 @@ export namespace TypeBuilderErrorReason {
}
}

/** Type system constants. */
export type TypeSystem = binaryen.TypeSystem;
export namespace TypeSystem {
export const Isorecursive: TypeSystem = 0 /* _BinaryenTypeSystemIsorecursive */;
export const Nominal: TypeSystem = 1 /* _BinaryenTypeSystemNominal */;
}

/** Binaryen feature constants. */
export const enum FeatureFlags {
MVP = 0 /* _BinaryenFeatureMVP */,
Expand All @@ -224,11 +217,11 @@ export const enum FeatureFlags {
MultiValue = 512 /* _BinaryenFeatureMultivalue */,
GC = 1024 /* _BinaryenFeatureGC */,
Memory64 = 2048 /* _BinaryenFeatureMemory64 */,
RelaxedSIMD = 8192 /* _BinaryenFeatureRelaxedSIMD */,
ExtendedConst = 16384 /* _BinaryenFeatureExtendedConst */,
Stringref = 32768 /* _BinaryenFeatureStrings */,
MultiMemory = 65536 /* _BinaryenFeatureMultiMemories */,
All = 126975 /* _BinaryenFeatureAll */
RelaxedSIMD = 4096 /* _BinaryenFeatureRelaxedSIMD */,
ExtendedConst = 8192 /* _BinaryenFeatureExtendedConst */,
Stringref = 16384 /* _BinaryenFeatureStrings */,
MultiMemory = 32768 /* _BinaryenFeatureMultiMemory */,
All = 131071 /* _BinaryenFeatureAll */
}

/** Binaryen expression id constants. */
Expand Down Expand Up @@ -282,43 +275,44 @@ export const enum ExpressionId {
TableSet = 46 /* _BinaryenTableSetId */,
TableSize = 47 /* _BinaryenTableSizeId */,
TableGrow = 48 /* _BinaryenTableGrowId */,
Try = 49 /* _BinaryenTryId */,
Throw = 50 /* _BinaryenThrowId */,
Rethrow = 51 /* _BinaryenRethrowId */,
TupleMake = 52 /* _BinaryenTupleMakeId */,
TupleExtract = 53 /* _BinaryenTupleExtractId */,
I31New = 54 /* _BinaryenI31NewId */,
I31Get = 55 /* _BinaryenI31GetId */,
CallRef = 56 /* _BinaryenCallRefId */,
RefTest = 57 /* _BinaryenRefTestId */,
RefCast = 58 /* _BinaryenRefCastId */,
BrOn = 59 /* _BinaryenBrOnId */,
StructNew = 60 /* _BinaryenStructNewId */,
StructGet = 61 /* _BinaryenStructGetId */,
StructSet = 62 /* _BinaryenStructSetId */,
ArrayNew = 63 /* _BinaryenArrayNewId */,
Try = 50 /* _BinaryenTryId */,
Throw = 51 /* _BinaryenThrowId */,
Rethrow = 52 /* _BinaryenRethrowId */,
TupleMake = 53 /* _BinaryenTupleMakeId */,
TupleExtract = 54 /* _BinaryenTupleExtractId */,
RefI31 = 55 /* _BinaryenRefI31Id */,
I31Get = 56 /* _BinaryenI31GetId */,
CallRef = 57 /* _BinaryenCallRefId */,
RefTest = 58 /* _BinaryenRefTestId */,
RefCast = 59 /* _BinaryenRefCastId */,
BrOn = 60 /* _BinaryenBrOnId */,
StructNew = 61 /* _BinaryenStructNewId */,
StructGet = 62 /* _BinaryenStructGetId */,
StructSet = 63 /* _BinaryenStructSetId */,
ArrayNew = 64 /* _BinaryenArrayNewId */,
ArrayNewSeg = 64 /* TODO_BinaryenArraySegId */,
ArrayNewFixed = 65 /* _BinaryenArrayNewFixedId */,
ArrayGet = 66 /* _BinaryenArrayGetId */,
ArraySet = 67 /* _BinaryenArraySetId */,
ArrayLen = 68 /* _BinaryenArrayLenId */,
ArrayCopy = 69 /* _BinaryenArrayCopyId */,
ArrayFill = 70 /* _BinaryenArrayFillId */,
ArrayInit = 71 /* _BinaryenArrayInitId */,
RefAs = 72 /* _BinaryenRefAsId */,
StringNew = 73 /* _BinaryenStringNewId */,
StringConst = 74 /* _BinaryenStringConstId */,
StringMeasure = 75 /* _BinaryenStringMeasureId */,
StringEncode = 76 /* _BinaryenStringEncodeId */,
StringConcat = 77 /* _BinaryenStringConcatId */,
StringEq = 78 /* _BinaryenStringEqId */,
StringAs = 79 /* _BinaryenStringAsId */,
StringWTF8Advance = 80 /* _BinaryenStringWTF8AdvanceId */,
StringWTF16Get = 81 /* _BinaryenStringWTF16GetId */,
StringIterNext = 82 /* _BinaryenStringIterNextId */,
StringIterMove = 83 /* _BinaryenStringIterMoveId */,
StringSliceWTF = 84 /* _BinaryenStringSliceWTFId */,
StringSliceIter = 85 /* _BinaryenStringSliceIterId */
ArrayNewFixed = 67 /* _BinaryenArrayNewFixedId */,
ArrayGet = 68 /* _BinaryenArrayGetId */,
ArraySet = 69 /* _BinaryenArraySetId */,
ArrayLen = 70 /* _BinaryenArrayLenId */,
ArrayCopy = 71 /* _BinaryenArrayCopyId */,
ArrayFill = 72 /* _BinaryenArrayFillId */,
ArrayInitData = 73 /* _BinaryenArrayInitDataId */,
ArrayInitElem = 74 /* _BinaryenArrayInitElemId */,
RefAs = 75 /* _BinaryenRefAsId */,
StringNew = 76 /* _BinaryenStringNewId */,
StringConst = 77 /* _BinaryenStringConstId */,
StringMeasure = 78 /* _BinaryenStringMeasureId */,
StringEncode = 79 /* _BinaryenStringEncodeId */,
StringConcat = 80 /* _BinaryenStringConcatId */,
StringEq = 81 /* _BinaryenStringEqId */,
StringAs = 82 /* _BinaryenStringAsId */,
StringWTF8Advance = 83 /* _BinaryenStringWTF8AdvanceId */,
StringWTF16Get = 84 /* _BinaryenStringWTF16GetId */,
StringIterNext = 85 /* _BinaryenStringIterNextId */,
StringIterMove = 86 /* _BinaryenStringIterMoveId */,
StringSliceWTF = 87 /* _BinaryenStringSliceWTFId */,
StringSliceIter = 88 /* _BinaryenStringSliceIterId */
}

/** Binaryen external kind constants. */
Expand Down Expand Up @@ -1272,15 +1266,15 @@ export const enum StringNewOp {
/** string.new_wtf8 wtf8 */
WTF8 = 1 /* _BinaryenStringNewWTF8 */,
/** string.new_wtf8 replace */
Replace = 2 /* _BinaryenStringNewReplace */,
LossyUTF8 = 2 /* _BinaryenStringNewLossyUTF8 */,
/** string.new_wtf16 */
WTF16 = 3 /* _BinaryenStringNewWTF16 */,
/** string.new_wtf8_array utf8 */
UTF8Array = 4 /* _BinaryenStringNewUTF8Array */,
/** string.new_wtf8_array wtf8 */
WTF8Array = 5 /* _BinaryenStringNewWTF8Array */,
/** string.new_wtf8_array replace */
ReplaceArray = 6 /* _BinaryenStringNewReplaceArray */,
LossyUTF8Array = 6 /* _BinaryenStringNewLossyUTF8Array */,
/** string.new_wtf16_array */
WTF16Array = 7 /* _BinaryenStringNewWTF16Array */,
/** string.from_code_point */
Expand All @@ -1305,16 +1299,20 @@ export const enum StringMeasureOp {
export const enum StringEncodeOp {
/** string.encode_wtf8 utf8 */
UTF8 = 0 /* _BinaryenStringEncodeUTF8 */,
/** string.encode_lossy_utf8 utf8 */
LossyUTF8 = 1 /* _BinaryenStringEncodeLossyUTF8 */,
/** string.encode_wtf8 wtf8 */
WTF8 = 1 /* _BinaryenStringEncodeWTF8 */,
WTF8 = 2 /* _BinaryenStringEncodeWTF8 */,
/** string.encode_wtf16 */
WTF16 = 2 /* _BinaryenStringEncodeWTF16 */,
WTF16 = 3 /* _BinaryenStringEncodeWTF16 */,
/** string.encode_wtf8_array utf8 */
UTF8Array = 3 /* _BinaryenStringEncodeUTF8Array */,
UTF8Array = 4 /* _BinaryenStringEncodeUTF8Array */,
/** string.encode_lossy_utf8_array utf8 */
LossyUTF8Array = 5 /* _BinaryenStringEncodeLossyUTF8Array */,
/** string.encode_wtf8_array wtf8 */
WTF8Array = 4 /* _BinaryenStringEncodeWTF8Array */,
WTF8Array = 6 /* _BinaryenStringEncodeWTF8Array */,
/** string.encode_wtf16_array */
WTF16Array = 5 /* _BinaryenStringEncodeWTF16Array */
WTF16Array = 7 /* _BinaryenStringEncodeWTF16Array */
}

/** Binaryen StringEq operation constants. */
Expand Down Expand Up @@ -1378,7 +1376,6 @@ export class Module {
) {
assert(sizeType == TypeRef.I32 || sizeType == TypeRef.I64);
this.lit = binaryen._malloc(binaryen._BinaryenSizeofLiteral());
binaryen._BinaryenSetTypeSystem(TypeSystem.Nominal);
}

private lit: usize;
Expand Down Expand Up @@ -2126,7 +2123,7 @@ export class Module {
i31_new(
value: ExpressionRef
): ExpressionRef {
return binaryen._BinaryenI31New(this.ref, value);
return binaryen._BinaryenRefI31(this.ref, value);
}

i31_get(
Expand Down Expand Up @@ -2959,7 +2956,7 @@ export class Module {
case ExpressionId.Const:
case ExpressionId.RefNull:
case ExpressionId.RefFunc:
case ExpressionId.I31New: return true;
case ExpressionId.RefI31: return true;
case ExpressionId.Binary: {
if (this.getFeatures() & FeatureFlags.ExtendedConst) {
switch (getBinaryOp(expr)) {
Expand Down Expand Up @@ -3713,7 +3710,6 @@ export function ensureType(type: Type): TypeRef {
// @ts-ignore: Wasm only
assert(sizeof<usize>() == 4); // ABI code below assumes 32-bit pointers
}
assert(binaryen._BinaryenGetTypeSystem() == TypeSystem.Nominal);
let builder = binaryen._TypeBuilderCreate(0);
let seen = new Map<Type,HeapTypeRef>();
prepareType(builder, seen, type); // drop temp return
Expand Down
Loading