Update binaryen (#2029)

Author: MaxGraey

cli/asc.d.ts

@@ -139,6 +139,8 @@ export interface CompilerOptions {
   maximumMemory?: number;
   /** Declare memory as shared. Requires maximumMemory. */
   sharedMemory?: boolean;
+  /** Assume that imported memory is zero filled. Requires importMemory. */
+  zeroFilledMemory?: boolean;
   /** Sets the start offset of compiler-generated static memory. */
   memoryBase?: number;
   /** Imports the function table provided as 'env.table'. */

cli/asc.js

@@ -943,6 +943,10 @@ exports.main = function main(argv, options, callback) {
   // Optimize the module
   const debugInfo = opts.debug;
   const converge = opts.converge;
+  const zeroFilledMemory = opts.importMemory
+    ? opts.zeroFilledMemory
+    : false;
+
   const runPasses = [];
   if (opts.runPasses) {
     if (typeof opts.runPasses === "string") {
@@ -960,7 +964,7 @@ exports.main = function main(argv, options, callback) {
   stats.optimizeTime += measure(() => {
     stats.optimizeCount++;
     try {
-      module.optimize(optimizeLevel, shrinkLevel, debugInfo);
+      module.optimize(optimizeLevel, shrinkLevel, debugInfo, zeroFilledMemory);
     } catch (e) {
       crash("optimize", e);
     }
@@ -979,7 +983,7 @@ exports.main = function main(argv, options, callback) {
       do {
         stats.optimizeCount++;
         try {
-          module.optimize(optimizeLevel, shrinkLevel, debugInfo);
+          module.optimize(optimizeLevel, shrinkLevel, debugInfo, zeroFilledMemory);
         } catch (e) {
           crash("optimize (converge)", e);
         }

cli/asc.json

@@ -156,6 +156,12 @@
     "type": "b",
     "default": false
   },
+  "zeroFilledMemory": {
+    "category": "Features",
+    "description": "Assume that imported memory is zero filled. Requires importMemory.",
+    "type": "b",
+    "default": false
+  },
   "importTable": {
     "category": "Features",
     "description": "Imports the function table from 'env.table'.",

package-lock.json

@@ -21,7 +21,7 @@
     "url": "https://github.com/AssemblyScript/assemblyscript/issues"
   },
   "dependencies": {
-    "binaryen": "101.0.0-nightly.20210723",
+    "binaryen": "101.0.0-nightly.20210904",
     "long": "^4.0.0",
     "source-map-support": "^0.5.19",
     "ts-node": "^6.2.0"

package.json

@@ -225,6 +225,8 @@ export class Options {
   maximumMemory: u32 = 0;
   /** If true, memory is declared as shared. */
   sharedMemory: bool = false;
+  /** If true, imported memory is zero filled. */
+  zeroFilledMemory: bool = false;
   /** If true, imports the function table provided by the embedder. */
   importTable: bool = false;
   /** If true, exports the function table. */
@@ -425,9 +427,9 @@ export class Compiler extends DiagnosticEmitter {
     var featureFlags: FeatureFlags = 0;
     if (options.hasFeature(Feature.SIGN_EXTENSION)) featureFlags |= FeatureFlags.SignExt;
     if (options.hasFeature(Feature.MUTABLE_GLOBALS)) featureFlags |= FeatureFlags.MutableGloabls;
-    if (options.hasFeature(Feature.NONTRAPPING_F2I)) featureFlags |= FeatureFlags.NontrappingFPToInt;
+    if (options.hasFeature(Feature.NONTRAPPING_F2I)) featureFlags |= FeatureFlags.TruncSat;
     if (options.hasFeature(Feature.BULK_MEMORY)) featureFlags |= FeatureFlags.BulkMemory;
-    if (options.hasFeature(Feature.SIMD)) featureFlags |= FeatureFlags.SIMD128;
+    if (options.hasFeature(Feature.SIMD)) featureFlags |= FeatureFlags.SIMD;
     if (options.hasFeature(Feature.THREADS)) featureFlags |= FeatureFlags.Atomics;
     if (options.hasFeature(Feature.EXCEPTION_HANDLING)) featureFlags |= FeatureFlags.ExceptionHandling;
     if (options.hasFeature(Feature.TAIL_CALLS)) featureFlags |= FeatureFlags.TailCall;
@@ -7232,7 +7234,7 @@ export class Compiler extends DiagnosticEmitter {
         // We know the last operand is optional and omitted, so inject setting
         // ~argumentsLength into that operand, which is always safe.
         let lastOperand = operands[maxOperands - 1];
-        assert(!(getSideEffects(lastOperand) & SideEffects.WritesGlobal));
+        assert(!(getSideEffects(lastOperand, module.ref) & SideEffects.WritesGlobal));
         let lastOperandType = parameterTypes[maxArguments - 1];
         operands[maxOperands - 1] = module.block(null, [
           module.global_set(this.ensureArgumentsLength(), module.i32(numArguments)),
@@ -7339,7 +7341,7 @@ export class Compiler extends DiagnosticEmitter {
     // into the index argument, which becomes executed last after any operands.
     var argumentsLength = this.ensureArgumentsLength();
     var sizeTypeRef = this.options.sizeTypeRef;
-    if (getSideEffects(functionArg) & SideEffects.WritesGlobal) {
+    if (getSideEffects(functionArg, module.ref) & SideEffects.WritesGlobal) {
       let flow = this.currentFlow;
       let temp = flow.getTempLocal(this.options.usizeType, findUsedLocals(functionArg));
       functionArg = module.block(null, [

src/compiler.ts

@@ -531,7 +531,7 @@ export declare function _BinaryenTagGetName(tag: TagRef): StringRef;
 export declare function _BinaryenTagGetParams(tag: TagRef): TypeRef;
 export declare function _BinaryenTagGetResults(tag: TagRef): TypeRef;
 
-export declare function _BinaryenAddTable(module: ModuleRef, name: StringRef, initial: Index, maximum: Index): TableRef;
+export declare function _BinaryenAddTable(module: ModuleRef, name: StringRef, initial: Index, maximum: Index, type: TypeRef): TableRef;
 export declare function _BinaryenRemoveTable(module: ModuleRef, table: StringRef): void;
 export declare function _BinaryenGetNumTables(module: ModuleRef): Index;
 export declare function _BinaryenGetTable(module: ModuleRef, name: StringRef): TableRef;
@@ -577,7 +577,7 @@ export declare function _BinaryenModuleSetFeatures(module: ModuleRef, featureFla
 
 export declare function _BinaryenAddCustomSection(module: ModuleRef, name: StringRef, contents: ArrayRef<u8>, contentsSize: Index): void;
 
-export declare function _BinaryenExpressionGetSideEffects(expr: ExpressionRef, features: FeatureFlags): SideEffects;
+export declare function _BinaryenExpressionGetSideEffects(expr: ExpressionRef, module: ModuleRef): SideEffects;
 
 export declare function _RelooperCreate(module: ModuleRef): RelooperRef;
 export declare function _RelooperAddBlock(relooper: RelooperRef, code: ExpressionRef): RelooperBlockRef;
@@ -599,6 +599,8 @@ export declare function _BinaryenGetDebugInfo(): bool;
 export declare function _BinaryenSetDebugInfo(on: bool): void;
 export declare function _BinaryenGetLowMemoryUnused(): bool;
 export declare function _BinaryenSetLowMemoryUnused(on: bool): void;
+export declare function _BinaryenGetZeroFilledMemory(): bool;
+export declare function _BinaryenSetZeroFilledMemory(on: bool): void;
 export declare function _BinaryenGetFastMath(): bool;
 export declare function _BinaryenSetFastMath(on: bool): void;
 export declare function _BinaryenGetPassArgument(key: StringRef): StringRef;