integrate #2531, prepare types

Author: dcodeIO

src/glue/binaryen.d.ts

@@ -60,6 +60,9 @@ export declare function _BinaryenTypeStringref(): TypeRef;
 export declare function _BinaryenTypeStringviewWTF8(): TypeRef;
 export declare function _BinaryenTypeStringviewWTF16(): TypeRef;
 export declare function _BinaryenTypeStringviewIter(): TypeRef;
+export declare function _BinaryenTypeNullref(): TypeRef;
+export declare function _BinaryenTypeNullExternref(): TypeRef;
+export declare function _BinaryenTypeNullFuncref(): TypeRef;
 
 export declare function _BinaryenHeapTypeFunc(): HeapTypeRef;
 export declare function _BinaryenHeapTypeExt(): HeapTypeRef;
@@ -594,7 +597,7 @@ export declare function _BinaryenStructSetSetValue(expr: ExpressionRef, valueExp
 export declare function _BinaryenArrayNew(module: ModuleRef, type: HeapTypeRef, size: ExpressionRef, init: ExpressionRef): ExpressionRef;
 export declare function _BinaryenArrayNewGetInit(expr: ExpressionRef): ExpressionRef;
 export declare function _BinaryenArrayNewSetInit(expr: ExpressionRef, initExpr: ExpressionRef): void;
-export declare function _BinaryenArrayNewGetSize(expr: ExpressionRef): ExpressionRef; 
+export declare function _BinaryenArrayNewGetSize(expr: ExpressionRef): ExpressionRef;
 export declare function _BinaryenArrayNewSetSize(expr: ExpressionRef, sizeExpr: ExpressionRef): void;
 
 export declare function _BinaryenArrayInit(module: ModuleRef, type: HeapTypeRef, values: ArrayRef<ExpressionRef>, numValues: Index): ExpressionRef;
@@ -605,7 +608,7 @@ export declare function _BinaryenArrayInitAppendValue(expr: ExpressionRef, value
 export declare function _BinaryenArrayInitInsertValueAt(expr: ExpressionRef, index: Index, valueExpr: ExpressionRef): void;
 export declare function _BinaryenArrayInitRemoveValueAt(expr: ExpressionRef, index: Index): ExpressionRef;
 
-export declare function _BinaryenArrayGet(module: ModuleRef, ref: ExpressionRef, index: ExpressionRef, signed: bool): ExpressionRef;
+export declare function _BinaryenArrayGet(module: ModuleRef, ref: ExpressionRef, index: ExpressionRef, type: TypeRef, signed: bool): ExpressionRef;
 export declare function _BinaryenArrayGetGetRef(expr: ExpressionRef): ExpressionRef;
 export declare function _BinaryenArrayGetSetRef(expr: ExpressionRef, refExpr: ExpressionRef): void;
 export declare function _BinaryenArrayGetGetIndex(expr: ExpressionRef): ExpressionRef;

src/glue/binaryen.js

@@ -23,6 +23,9 @@ export const {
   _BinaryenTypeStringviewWTF8,
   _BinaryenTypeStringviewWTF16,
   _BinaryenTypeStringviewIter,
+  _BinaryenTypeNullref,
+  _BinaryenTypeNullExternref,
+  _BinaryenTypeNullFuncref,
 
   _BinaryenHeapTypeFunc,
   _BinaryenHeapTypeExt,

src/module.ts

@@ -81,25 +81,47 @@ export namespace TypeRef {
   export const StringviewWTF8 = binaryen._BinaryenTypeStringviewWTF8();
   export const StringviewWTF16 = binaryen._BinaryenTypeStringviewWTF16();
   export const StringviewIter = binaryen._BinaryenTypeStringviewIter();
+  // bottom types
+  export const Noneref = binaryen._BinaryenTypeNullref();
+  export const Nofuncref = binaryen._BinaryenTypeNullFuncref();
+  export const Noexternref = binaryen._BinaryenTypeNullExternref();
 
   export const Auto: TypeRef = -1 /* _BinaryenTypeAuto */;
 }
 
 /** Reference to a Binaryen heap type. */
 export type HeapTypeRef = binaryen.HeapTypeRef;
 export namespace HeapTypeRef {
+
+  //        any       extern      func
+  //         |           |          |
+  //     __ eq __     noextern    (...)
+  //    /    |   \                  |
+  // i31  struct  array           nofunc
+  //  |      |      |
+  // none  (...)  (...)
+  //         |      |
+  //        none   none
+  //
+  // where (...) represents the concrete subtypes
+
   // reference & GC heap types
-  export const Ext: HeapTypeRef = binaryen._BinaryenHeapTypeExt();
+  export const Extern: HeapTypeRef = binaryen._BinaryenHeapTypeExt();
   export const Func: HeapTypeRef = binaryen._BinaryenHeapTypeFunc();
   export const Any: HeapTypeRef = binaryen._BinaryenHeapTypeAny();
   export const Eq: HeapTypeRef = binaryen._BinaryenHeapTypeEq();
   export const I31: HeapTypeRef = binaryen._BinaryenHeapTypeI31();
-  export const Data: HeapTypeRef = binaryen._BinaryenHeapTypeData();
+  export const Data: HeapTypeRef = binaryen._BinaryenHeapTypeData(); // TODO: struct
+  // export const Array: HeapTypeRef = binaryen._BinaryenHeapTypeArray(); // TODO
   // string heap types
   export const String: HeapTypeRef = binaryen._BinaryenHeapTypeString();
   export const StringviewWTF8: HeapTypeRef = binaryen._BinaryenHeapTypeStringviewWTF8();
   export const StringviewWTF16: HeapTypeRef = binaryen._BinaryenHeapTypeStringviewWTF16();
   export const StringviewIter: HeapTypeRef = binaryen._BinaryenHeapTypeStringviewIter();
+  // bottom heap types
+  export const None: HeapTypeRef = 10; /* TODO_BinaryenHeapTypeNone */
+  export const Noextern: HeapTypeRef = 11; /* TODO_BinaryenHeapTypeNoext */
+  export const Nofunc: HeapTypeRef = 12; /* TODO_BinaryenHeapTypeNofunc */
 }
 
 /** Packed array element respectively struct field types. */
@@ -3699,7 +3721,7 @@ function tryEnsureBasicType(type: Type): TypeRef {
       return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Func, type.is(TypeFlags.NULLABLE));
     }
     case TypeKind.EXTERNREF: {
-      return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Ext, type.is(TypeFlags.NULLABLE));
+      return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Extern, type.is(TypeFlags.NULLABLE));
     }
     case TypeKind.ANYREF: {
       return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Any, type.is(TypeFlags.NULLABLE));

src/types.ts

@@ -607,7 +607,7 @@ export class Type {
         return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Func, this.is(TypeFlags.NULLABLE));
       }
       case TypeKind.EXTERNREF: {
-        return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Ext, this.is(TypeFlags.NULLABLE));
+        return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Extern, this.is(TypeFlags.NULLABLE));
       }
       case TypeKind.ANYREF: {
         return binaryen._BinaryenTypeFromHeapType(HeapTypeRef.Any, this.is(TypeFlags.NULLABLE));