Merge remote-tracking branch 'origin/master' into release

Author: actions-user

cli/asc.js

@@ -227,6 +227,7 @@ exports.main = function main(argv, options, callback) {
   assemblyscript.setExportTable(compilerOptions, args.exportTable);
   assemblyscript.setExplicitStart(compilerOptions, args.explicitStart);
   assemblyscript.setMemoryBase(compilerOptions, args.memoryBase >>> 0);
+  assemblyscript.setTableBase(compilerOptions, args.tableBase >>> 0);
   assemblyscript.setSourceMap(compilerOptions, args.sourceMap != null);
   assemblyscript.setNoUnsafe(compilerOptions, args.noUnsafe);
   assemblyscript.setPedantic(compilerOptions, args.pedantic);

cli/asc.json

@@ -191,9 +191,16 @@
     "type": "S",
     "alias": "u"
   },
+
   "memoryBase": {
-    "category": "Features",
-    "description": "Sets the start offset of compiler-generated static memory.",
+    "category": "Linking",
+    "description": "Sets the start offset of emitted memory segments.",
+    "type": "i",
+    "default": 0
+  },
+  "tableBase": {
+    "category": "Linking",
+    "description": "Sets the start offset of emitted table elements.",
     "type": "i",
     "default": 0
   },

src/common.ts

@@ -151,6 +151,7 @@ export namespace CommonNames {
   export const ASC_NO_TREESHAKING = "ASC_NO_TREESHAKING";
   export const ASC_NO_ASSERT = "ASC_NO_ASSERT";
   export const ASC_MEMORY_BASE = "ASC_MEMORY_BASE";
+  export const ASC_TABLE_BASE = "ASC_TABLE_BASE";
   export const ASC_OPTIMIZE_LEVEL = "ASC_OPTIMIZE_LEVEL";
   export const ASC_SHRINK_LEVEL = "ASC_SHRINK_LEVEL";
   export const ASC_FEATURE_SIGN_EXTENSION = "ASC_FEATURE_SIGN_EXTENSION";

src/compiler.ts

@@ -204,6 +204,8 @@ export class Options {
   explicitStart: bool = false;
   /** Static memory start offset. */
   memoryBase: i32 = 0;
+  /** Static table start offset. */
+  tableBase: i32 = 0;
   /** Global aliases, mapping alias names as the key to internal names to be aliased as the value. */
   globalAliases: Map<string,string> | null = null;
   /** Features to activate by default. These are the finished proposals. */
@@ -500,7 +502,9 @@ export class Compiler extends DiagnosticEmitter {
 
     // set up function table (first elem is blank)
     var functionTable = this.functionTable;
-    module.setFunctionTable(1 + functionTable.length, Module.UNLIMITED_TABLE, functionTable, module.i32(1));
+    var tableBase = this.options.tableBase;
+    if (!tableBase) tableBase = 1; // leave first elem blank
+    module.setFunctionTable(tableBase + functionTable.length, Module.UNLIMITED_TABLE, functionTable, module.i32(tableBase));
 
     // import and/or export table if requested (default table is named '0' by Binaryen)
     if (options.importTable) {
@@ -992,7 +996,11 @@ export class Compiler extends DiagnosticEmitter {
 
     // Initialize to zero if there's no initializer
     } else {
-      initExpr = this.makeZero(type);
+      if (global.is(CommonFlags.INLINED)) {
+        initExpr = this.compileInlineConstant(global, global.type, Constraints.PREFER_STATIC | Constraints.WILL_RETAIN);
+      } else {
+        initExpr = this.makeZero(type);
+      }
     }
 
     var internalName = global.internalName;
@@ -1644,12 +1652,11 @@ export class Compiler extends DiagnosticEmitter {
   ensureFunctionTableEntry(instance: Function): i32 {
     assert(instance.is(CommonFlags.COMPILED));
     var index = instance.functionTableIndex;
-    if (index >= 0) {
-      assert(index != 0); // first elem must be blank
-      return index;
-    }
+    if (index >= 0) return index;
     var functionTable = this.functionTable;
-    index = 1 + functionTable.length; // first elem is blank
+    var tableBase = this.options.tableBase;
+    if (!tableBase) tableBase = 1; // leave first elem blank
+    index = tableBase + functionTable.length;
     if (!instance.is(CommonFlags.TRAMPOLINE) && instance.signature.requiredParameters < instance.signature.parameterTypes.length) {
       // insert the trampoline if the function has optional parameters
       instance = this.ensureTrampoline(instance);
@@ -2990,7 +2997,7 @@ export class Compiler extends DiagnosticEmitter {
     contextualType: Type,
     constraints: Constraints
   ): ExpressionRef {
-    assert(element.is(CommonFlags.INLINED));
+    assert(element.is(CommonFlags.INLINED | CommonFlags.RESOLVED));
     var type = element.type;
     switch (
       !(constraints & (Constraints.CONV_IMPLICIT | Constraints.CONV_EXPLICIT)) &&

src/index.ts

@@ -57,6 +57,11 @@ export function setMemoryBase(options: Options, memoryBase: u32): void {
   options.memoryBase = memoryBase;
 }
 
+/** Sets the `tableBase` option. */
+export function setTableBase(options: Options, tableBase: u32): void {
+  options.tableBase = tableBase;
+}
+
 /** Sets a 'globalAliases' value. */
 export function setGlobalAlias(options: Options, alias: string, name: string): void {
   var globalAliases = options.globalAliases;

src/program.ts

@@ -679,6 +679,8 @@ export class Program extends DiagnosticEmitter {
       i64_new(options.noAssert ? 1 : 0, 0));
     this.registerConstantInteger(CommonNames.ASC_MEMORY_BASE, Type.i32,
       i64_new(options.memoryBase, 0));
+    this.registerConstantInteger(CommonNames.ASC_TABLE_BASE, Type.i32,
+      i64_new(options.tableBase, 0));
     this.registerConstantInteger(CommonNames.ASC_OPTIMIZE_LEVEL, Type.i32,
       i64_new(options.optimizeLevelHint, 0));
     this.registerConstantInteger(CommonNames.ASC_SHRINK_LEVEL, Type.i32,

std/assembly/index.d.ts

@@ -46,6 +46,8 @@ declare const ASC_TARGET: i32;
 declare const ASC_NO_ASSERT: bool;
 /** Provided memoryBase option. */
 declare const ASC_MEMORY_BASE: i32;
+/** Provided tableBase option. */
+declare const ASC_TABLE_BASE: i32;
 /** Provided optimizeLevel option. */
 declare const ASC_OPTIMIZE_LEVEL: i32;
 /** Provided shrinkLevel option. */

tests/compiler/asc-constants.untouched.wat

@@ -8,7 +8,7 @@
  (global $~lib/ASC_OPTIMIZE_LEVEL i32 (i32.const 0))
  (global $~lib/ASC_SHRINK_LEVEL i32 (i32.const 0))
  (global $~lib/ASC_FEATURE_SIGN_EXTENSION i32 (i32.const 0))
- (global $~lib/ASC_FEATURE_MUTABLE_GLOBALS i32 (i32.const 0))
+ (global $~lib/ASC_FEATURE_MUTABLE_GLOBALS i32 (i32.const 1))
  (global $~lib/ASC_FEATURE_NONTRAPPING_F2I i32 (i32.const 0))
  (global $~lib/ASC_FEATURE_BULK_MEMORY i32 (i32.const 0))
  (global $~lib/ASC_FEATURE_SIMD i32 (i32.const 0))

tests/compiler/features/simd.untouched.wat

@@ -8,7 +8,7 @@
  (data (i32.const 16) "\1e\00\00\00\01\00\00\00\01\00\00\00\1e\00\00\00~\00l\00i\00b\00/\00r\00t\00/\00s\00t\00u\00b\00.\00t\00s\00")
  (data (i32.const 64) " \00\00\00\01\00\00\00\01\00\00\00 \00\00\00f\00e\00a\00t\00u\00r\00e\00s\00/\00s\00i\00m\00d\00.\00t\00s\00")
  (table $0 1 funcref)
- (global $~lib/ASC_FEATURE_SIMD i32 (i32.const 0))
+ (global $~lib/ASC_FEATURE_SIMD i32 (i32.const 1))
  (global $~lib/rt/stub/startOffset (mut i32) (i32.const 0))
  (global $~lib/rt/stub/offset (mut i32) (i32.const 0))
  (global $~lib/builtins/i16.MAX_VALUE i32 (i32.const 32767))

tests/compiler/features/threads.untouched.wat

@@ -2,7 +2,7 @@
  (type $none_=>_none (func))
  (memory $0 (shared 1 1))
  (table $0 1 funcref)
- (global $~lib/ASC_FEATURE_THREADS i32 (i32.const 0))
+ (global $~lib/ASC_FEATURE_THREADS i32 (i32.const 1))
  (export "memory" (memory $0))
  (start $~start)
  (func $features/threads/testAtomic (; 0 ;)