Update Binaryen (#1009)

Author: dcodeIO

package-lock.json

@@ -21,14 +21,13 @@
     "url": "https://github.com/AssemblyScript/assemblyscript/issues"
   },
   "dependencies": {
-    "binaryen": "89.0.0-nightly.20191204",
+    "binaryen": "89.0.0-nightly.20191215",
     "long": "^4.0.0",
     "source-map-support": "^0.5.16",
-    "ts-node": "^6.2.0",
-    "typescript": "^3.7.2"
+    "ts-node": "^6.2.0"
   },
   "devDependencies": {
-    "@types/node": "^12.12.7",
+    "@types/node": "^12.12.17",
     "browser-process-hrtime": "^1.0.0",
     "diff": "^4.0.1",
     "glob": "^7.1.6",
@@ -38,8 +37,8 @@
     "ts-node": "^6.2.0",
     "tslint": "^5.20.1",
     "typedoc-plugin-external-module-name": "^2.1.0",
-    "typescript": "^3.7.2",
-    "webpack": "^4.41.2",
+    "typescript": "^3.7.3",
+    "webpack": "^4.41.3",
     "webpack-cli": "^3.3.10"
   },
   "main": "index.js",

package.json

@@ -55,7 +55,8 @@ import {
   RelooperBlockRef,
   SIMDLoadOp,
   getLocalGetIndex,
-  hasSideEffects
+  hasSideEffects,
+  createType
 } from "./module";
 
 import {
@@ -4757,7 +4758,6 @@ export function compileAbort(
 export function compileVisitGlobals(compiler: Compiler): void {
   var module = compiler.module;
   var exprs = new Array<ExpressionRef>();
-  var typeRef = compiler.ensureFunctionType([ Type.u32 ], Type.void); // cookie
   var nativeSizeType = compiler.options.nativeSizeType;
   var visitInstance = assert(compiler.program.visitInstance);
 
@@ -4800,7 +4800,10 @@ export function compileVisitGlobals(compiler: Compiler): void {
       }
     }
   }
-  module.addFunction(BuiltinSymbols.visit_globals, typeRef, [ nativeSizeType ],
+  module.addFunction(BuiltinSymbols.visit_globals,
+    NativeType.I32,  // cookie
+    NativeType.None, // => void
+    [ nativeSizeType ],
     exprs.length
       ? module.block(null, exprs)
       : module.nop()
@@ -4814,7 +4817,6 @@ export function compileVisitMembers(compiler: Compiler): void {
   var usizeType = program.options.usizeType;
   var nativeSizeType = usizeType.toNativeType();
   var nativeSizeSize = usizeType.byteSize;
-  var ftype = compiler.ensureFunctionType([ usizeType, Type.i32 ], Type.void); // ref, cookie
   var managedClasses = program.managedClasses;
   var visitInstance = assert(program.visitInstance);
   var blocks = new Array<RelooperBlockRef>();
@@ -4921,7 +4923,12 @@ export function compileVisitMembers(compiler: Compiler): void {
   );
   relooper.addBranchForSwitch(outer, blocks[blocks.length - 1], []); // default
   compiler.compileFunction(visitInstance);
-  module.addFunction(BuiltinSymbols.visit_members, ftype, [ nativeSizeType ], relooper.renderAndDispose(outer, 2));
+  module.addFunction(BuiltinSymbols.visit_members,
+    createType([ usizeType.toNativeType(), NativeType.I32 ]), // ref, cookie
+    NativeType.None, // => void
+    [ nativeSizeType ],
+    relooper.renderAndDispose(outer, 2)
+  );
 }
 
 function typeToRuntimeFlags(type: Type): TypeinfoFlags {

src/builtins.ts

@@ -26,7 +26,6 @@ import {
   NativeType,
   FunctionRef,
   ExpressionId,
-  FunctionTypeRef,
   GlobalRef,
   EventRef,
   FeatureFlags,
@@ -46,7 +45,8 @@ import {
   needsExplicitUnreachable,
   getLocalSetValue,
   getGlobalGetName,
-  isGlobalMutable
+  isGlobalMutable,
+  createType
 } from "./module";
 
 import {
@@ -395,11 +395,8 @@ export class Compiler extends DiagnosticEmitter {
       }
       let funcRef = module.addFunction(
         startFunctionInstance.internalName,
-        this.ensureFunctionType(
-          signature.parameterTypes,
-          signature.returnType,
-          signature.thisType
-        ),
+        signature.nativeParams,
+        signature.nativeResults,
         typesToNativeTypes(startFunctionInstance.additionalLocals),
         module.block(null, startFunctionBody)
       );
@@ -456,7 +453,7 @@ export class Compiler extends DiagnosticEmitter {
     // set up function table
     var functionTable = this.functionTable;
     module.setFunctionTable(functionTable.length, Module.UNLIMITED_TABLE, functionTable, module.i32(0));
-    module.addFunction("null", this.ensureFunctionType(null, Type.void), null, module.unreachable());
+    module.addFunction("null", NativeType.None, NativeType.None, null, module.unreachable());
 
     // import table if requested (default table is named '0' by Binaryen)
     if (options.importTable) module.addTableImport("0", "env", "table");
@@ -628,7 +625,8 @@ export class Compiler extends DiagnosticEmitter {
     if (type.isManaged) loadExpr = this.makeRetain(loadExpr);
     module.addFunction(
       name,
-      this.ensureFunctionType(null, type, usizeType),
+      usizeType.toNativeType(),
+      type.toNativeType(),
       null,
       loadExpr
     );
@@ -654,7 +652,8 @@ export class Compiler extends DiagnosticEmitter {
     }
     module.addFunction(
       name,
-      this.ensureFunctionType([ type ], Type.void, usizeType),
+      createType([ usizeType.toNativeType(), type.toNativeType() ]),
+      NativeType.None,
       null,
       module.store(
         type.byteSize,
@@ -759,6 +758,7 @@ export class Compiler extends DiagnosticEmitter {
 
     // compile top-level statements within the file's start function
     var startFunction = file.startFunction;
+    var startSignature = startFunction.signature;
     var previousBody = this.currentBody;
     var startFunctionBody = new Array<ExpressionRef>();
     this.currentBody = startFunctionBody;
@@ -781,9 +781,11 @@ export class Compiler extends DiagnosticEmitter {
       let numLocals = locals.length;
       let varTypes = new Array<NativeType>(numLocals);
       for (let i = 0; i < numLocals; ++i) varTypes[i] = locals[i].type.toNativeType();
+
       module.addFunction(
         startFunction.internalName,
-        this.ensureFunctionType(startFunction.signature.parameterTypes, startFunction.signature.returnType),
+        startSignature.nativeParams,
+        startSignature.nativeResults,
         varTypes,
         startFunctionBody.length > 1
           ? module.block(null, startFunctionBody)
@@ -1112,51 +1114,6 @@ export class Compiler extends DiagnosticEmitter {
     return instance;
   }
 
-  /** Either reuses or creates the function type matching the specified signature. */
-  ensureFunctionType(
-    parameterTypes: Type[] | null,
-    returnType: Type,
-    thisType: Type | null = null
-  ): FunctionTypeRef {
-    var numParameters = parameterTypes ? parameterTypes.length : 0;
-    var paramTypes: NativeType[];
-    var index = 0;
-    if (thisType) {
-      paramTypes = new Array(1 + numParameters);
-      paramTypes[0] = thisType.toNativeType();
-      index = 1;
-    } else {
-      paramTypes = new Array(numParameters);
-    }
-    if (parameterTypes) {
-      for (let i = 0; i < numParameters; ++i, ++index) {
-        paramTypes[index] = parameterTypes[i].toNativeType();
-      }
-    }
-    var resultType = returnType.toNativeType();
-    var module = this.module;
-    var typeRef = module.getFunctionTypeBySignature(resultType, paramTypes);
-    if (!typeRef) {
-      let name = Signature.makeSignatureString(parameterTypes, returnType, thisType);
-      typeRef = module.addFunctionType(name, resultType, paramTypes);
-    }
-    return typeRef;
-  }
-
-  /** Either reuses or creates the event type matching the specified name. */
-  ensureEventType(
-    name: string,
-    parameterTypes: Type[] | null
-  ): EventRef {
-    var events = this.events;
-    if (events.has(name)) return events.get(name)!;
-    var module = this.module;
-    var funcType = this.ensureFunctionType(parameterTypes, Type.void);
-    var eventType = module.addEvent(name, 0, funcType);
-    events.set(name, eventType);
-    return eventType;
-  }
-
   /** Compiles the body of a function within the specified flow. */
   compileFunctionBody(
     /** Function to compile. */
@@ -1274,7 +1231,6 @@ export class Compiler extends DiagnosticEmitter {
     var signature = instance.signature;
     var bodyNode = instance.prototype.bodyNode;
 
-    var typeRef = this.ensureFunctionType(signature.parameterTypes, signature.returnType, signature.thisType);
     var funcRef: FunctionRef;
 
     // concrete function
@@ -1336,7 +1292,8 @@ export class Compiler extends DiagnosticEmitter {
       // create the function
       funcRef = module.addFunction(
         instance.internalName,
-        typeRef,
+        signature.nativeParams,
+        signature.nativeResults,
         typesToNativeTypes(instance.additionalLocals),
         flatten(module, stmts, instance.signature.returnType.toNativeType())
       );
@@ -1358,7 +1315,8 @@ export class Compiler extends DiagnosticEmitter {
         instance.internalName,
         mangleImportName_moduleName,
         mangleImportName_elementName,
-        typeRef
+        signature.nativeParams,
+        signature.nativeResults
       );
       funcRef = module.getFunction(instance.internalName);
     }
@@ -6404,11 +6362,8 @@ export class Compiler extends DiagnosticEmitter {
 
     var funcRef = module.addFunction(
       trampoline.internalName,
-      this.ensureFunctionType(
-        trampolineSignature.parameterTypes,
-        returnType,
-        thisType
-      ),
+      trampolineSignature.nativeParams,
+      trampolineSignature.nativeResults,
       typesToNativeTypes(trampoline.additionalLocals),
       module.block(null, stmts, returnType.toNativeType())
     );
@@ -6435,7 +6390,8 @@ export class Compiler extends DiagnosticEmitter {
     if (!this.argcSet) {
       let module = this.module;
       this.argcSet = module.addFunction(BuiltinSymbols.setargc,
-        this.ensureFunctionType([ Type.u32 ], Type.void),
+        NativeType.I32,
+        NativeType.None,
         null,
         module.global_set(this.ensureArgcVar(),
           module.local_get(0, NativeType.I32)
@@ -6906,7 +6862,6 @@ export class Compiler extends DiagnosticEmitter {
     }
     assert(numOperands >= minOperands);
 
-    this.ensureFunctionType(signature.parameterTypes, signature.returnType, signature.thisType);
     var module = this.module;
 
     // fill up omitted arguments with zeroes
@@ -6931,7 +6886,8 @@ export class Compiler extends DiagnosticEmitter {
           ? module.unary(UnaryOp.WrapI64, indexArg)
           : indexArg,
         operands,
-        signature.toSignatureString()
+        signature.nativeParams,
+        signature.nativeResults
       )
     ], returnType.toNativeType());
     this.currentType = returnType;
@@ -7951,15 +7907,14 @@ export class Compiler extends DiagnosticEmitter {
     this.currentFlow = previousFlow;
 
     // make the function
-    var typeRef = this.ensureFunctionType(signature.parameterTypes, signature.returnType, signature.thisType);
     var locals = instance.localsByIndex;
     var varTypes = new Array<NativeType>(); // of temp. vars added while compiling initializers
     var numOperands = 1 + signature.parameterTypes.length;
     var numLocals = locals.length;
     if (numLocals > numOperands) {
       for (let i = numOperands; i < numLocals; ++i) varTypes.push(locals[i].type.toNativeType());
     }
-    var funcRef = module.addFunction(instance.internalName, typeRef, varTypes, body);
+    var funcRef = module.addFunction(instance.internalName, signature.nativeParams, signature.nativeResults, varTypes, body);
     instance.finalize(module, funcRef);
     return instance;
   }

src/compiler.ts

@@ -15,9 +15,8 @@ import {
   Index,
   getFunctionName,
   getFunctionBody,
-  getFunctionParamCount,
-  getFunctionParamType,
-  getFunctionResultType,
+  getFunctionParams,
+  getFunctionResults,
   getExpressionId,
   getExpressionType,
   getBlockName,
@@ -54,7 +53,8 @@ import {
   getDropValue,
   getReturnValue,
   getHostOp,
-  getHostOperand
+  getHostOperand,
+  expandType
 } from "./module";
 
 // TODO :-)
@@ -83,15 +83,27 @@ export class Decompiler {
     this.push("function ");
     this.push(name);
     this.push("(");
-     for (let i: Index = 0, k: Index = getFunctionParamCount(func); i < k; ++i) {
+    var params = expandType(getFunctionParams(func));
+    for (let i = 0, k = params.length; i < k; ++i) {
       if (i > 0) this.push(", ");
       this.push("$");
       this.push(i.toString(10));
       this.push(": ");
-      this.push(nativeTypeToType(getFunctionParamType(func, i)));
+      this.push(nativeTypeToType(params[i]));
     }
     this.push("): ");
-    this.push(nativeTypeToType(getFunctionResultType(func)));
+    var results = expandType(getFunctionResults(func));
+    switch (results.length) {
+      case 0: {
+        this.push("void");
+        break;
+      }
+      default: assert(false); // TODO: multi-value
+      case 1: {
+        this.push(nativeTypeToType(results[0]));
+        break;
+      }
+    }
     this.push(" ");
     if (getExpressionId(body) != ExpressionId.Block) {
       this.push("{\n");