Update Binaryen

Author: dcodeIO

dist/asc.js.map

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@protobufjs/utf8": "^1.1.0",
-    "binaryen": "49.0.0-nightly.20180731",
+    "binaryen": "^51.0.0",
     "glob": "^7.1.3",
     "long": "^4.0.0"
   },
@@ -26,7 +26,7 @@
     "typedoc": "^0.11.1",
     "typedoc-plugin-external-module-name": "^1.1.3",
     "typescript": "^3.0.3",
-    "webpack": "^4.17.2",
+    "webpack": "^4.18.1",
     "webpack-cli": "^3.1.0"
   },
   "main": "index.js",

dist/assemblyscript.js

@@ -3078,7 +3078,7 @@ export function ensureGCHook(
   // remember the function index so we don't recurse infinitely
   var functionTable = compiler.functionTable;
   var gcHookIndex = functionTable.length;
-  functionTable.push(0);
+  functionTable.push("<placeholder>");
   classInstance.gcHookIndex = gcHookIndex;
 
   // if the class extends a base class, call its hook first (calls mark)
@@ -3133,11 +3133,13 @@ export function ensureGCHook(
   }
 
   // add the function to the module and return its table index
-  functionTable[gcHookIndex] = module.addFunction(
-    classInstance.internalName + "~gc",
+  var funcName = classInstance.internalName + "~gc";
+  module.addFunction(
+    funcName,
     compiler.ensureFunctionType(null, Type.void, options.usizeType),
     null,
     module.createBlock(null, body)
   );
+  functionTable[gcHookIndex] = funcName;
   return gcHookIndex;
 }

dist/assemblyscript.js.map

@@ -286,7 +286,7 @@ export class Compiler extends DiagnosticEmitter {
   /** Map of already compiled static string segments. */
   stringSegments: Map<string,MemorySegment> = new Map();
   /** Function table being compiled. */
-  functionTable: FunctionRef[] = [];
+  functionTable: string[] = [];
   /** Argument count helper global. */
   argcVar: GlobalRef = 0;
   /** Argument count helper setter. */
@@ -1474,7 +1474,7 @@ export class Compiler extends DiagnosticEmitter {
       // insert the trampoline if the function has optional parameters
       func = this.ensureTrampoline(func);
     }
-    functionTable.push(func.ref);
+    functionTable.push(func.internalName);
     func.functionTableIndex = index;
     return index;
   }

package-lock.json

@@ -199,10 +199,8 @@ declare function _BinaryenGeFloat64(): BinaryenOp;
 
 declare type BinaryenHostOp = BinaryenOp;
 
-declare function _BinaryenPageSize(): BinaryenHostOp;
 declare function _BinaryenCurrentMemory(): BinaryenHostOp;
 declare function _BinaryenGrowMemory(): BinaryenHostOp;
-declare function _BinaryenHasFeature(): BinaryenHostOp;
 
 declare type BinaryenAtomicRMWOp = BinaryenOp;
 

package.json

@@ -204,10 +204,8 @@ export enum BinaryOp {
 }
 
 export enum HostOp {
-  PageSize = _BinaryenPageSize(),
   CurrentMemory = _BinaryenCurrentMemory(),
   GrowMemory = _BinaryenGrowMemory(),
-  HasFeature = _BinaryenHasFeature(),
 
   // see: https://github.com/WebAssembly/bulk-memory-operations
   // MoveMemory
@@ -875,12 +873,18 @@ export class Module {
     }
   }
 
-  setFunctionTable(funcs: FunctionRef[]): void {
-    var cArr = allocPtrArray(funcs);
+  setFunctionTable(funcs: string[]): void {
+    var numNames = funcs.length;
+    var names = new Array<usize>(numNames);
+    for (let i = 0; i < numNames; ++i) {
+      names[i] = allocString(funcs[i]);
+    }
+    var cArr = allocI32Array(names);
     try {
-      _BinaryenSetFunctionTable(this.ref, cArr, funcs.length);
+      _BinaryenSetFunctionTable(this.ref, cArr, numNames);
     } finally {
       memory.free(cArr);
+      for (let i = numNames; i >= 0; --i) memory.free(names[i]);
     }
   }