Merge branch 'master' into eqeqeq

Author: dcodeIO

.github/workflows/ci.yml

@@ -141,3 +141,20 @@ jobs:
         cd lib/loader
         npm run asbuild
         npm run test
+  test-bootstrap:
+    name: "Test self-compilation on node: node"
+    runs-on: ubuntu-latest
+    needs: check
+    steps:
+    - uses: actions/[email protected]
+    - uses: dcodeIO/[email protected]
+      with:
+        node-version: node
+    - name: Install dependencies
+      run: npm ci --no-audit
+    - name: Clean distribution files
+      run: npm run clean
+    - name: Test self-compilation
+      run: |
+        npm run asbuild
+        npm run astest

NOTICE

@@ -19,6 +19,7 @@ under the licensing terms detailed in LICENSE:
 * jhwgh1968 <[email protected]>
 * Jeffrey Charles <[email protected]>
 * Vladimir Tikhonov <[email protected]>
+* Duncan Uszkay <[email protected]>
 
 Portions of this software are derived from third-party works licensed under
 the following terms:

cli/asc.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview Definitions for asc.
+ * @license Apache-2.0
+ */
+
 import { OptionDescription } from "./util/options";
 export { OptionDescription };
 

cli/asc.js

@@ -1,15 +1,31 @@
-"use strict";
 /**
- * Compiler frontend for node.js
+ * @license
+ * Copyright 2020 Daniel Wirtz / The AssemblyScript Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Compiler frontend for node.js
  *
  * Uses the low-level API exported from src/index.ts so it works with the compiler compiled to
  * JavaScript as well as the compiler compiled to WebAssembly (eventually). Runs the sources
  * directly through ts-node if distribution files are not present (indicated by a `-dev` version).
  *
  * Can also be packaged as a bundle suitable for in-browser use with the standard library injected
  * in the build step. See dist/asc.js for the bundle and webpack.config.js for building details.
- *
- * @module cli/asc
  */
 
 // Use "." instead of "/" as cwd in browsers
@@ -231,12 +247,7 @@ exports.main = function main(argv, options, callback) {
   assemblyscript.setSourceMap(compilerOptions, args.sourceMap != null);
   assemblyscript.setNoUnsafe(compilerOptions, args.noUnsafe);
   assemblyscript.setPedantic(compilerOptions, args.pedantic);
-
-  // Initialize default aliases
-  assemblyscript.setGlobalAlias(compilerOptions, "Math", "NativeMath");
-  assemblyscript.setGlobalAlias(compilerOptions, "Mathf", "NativeMathf");
-  assemblyscript.setGlobalAlias(compilerOptions, "abort", "~lib/builtins/abort");
-  assemblyscript.setGlobalAlias(compilerOptions, "trace", "~lib/builtins/trace");
+  assemblyscript.setLowMemoryLimit(compilerOptions, args.lowMemoryLimit >>> 0);
 
   // Add or override aliases if specified
   if (args.use) {
@@ -390,7 +401,8 @@ exports.main = function main(argv, options, callback) {
       if ((sourceText = readFile(sourcePath = internalPath + ".ts", baseDir)) == null) {
         if ((sourceText = readFile(sourcePath = internalPath + "/index.ts", baseDir)) == null) {
           // portable d.ts: uses the .js file next to it in JS or becomes an import in Wasm
-          sourceText = readFile(sourcePath = internalPath + ".d.ts", baseDir);
+          sourcePath = internalPath + ".ts";
+          sourceText = readFile(internalPath + ".d.ts", baseDir);
         }
       }
 
@@ -478,13 +490,16 @@ exports.main = function main(argv, options, callback) {
     var internalPath;
     while ((internalPath = assemblyscript.nextFile(program)) != null) {
       let file = getFile(internalPath, assemblyscript.getDependee(program, internalPath));
-      if (!file) return callback(Error("Import file '" + internalPath + ".ts' not found."))
+      if (!file) return callback(Error("Import '" + internalPath + "' not found."))
       stats.parseCount++;
       stats.parseTime += measure(() => {
         assemblyscript.parse(program, file.sourceText, file.sourcePath, false);
       });
     }
-    if (checkDiagnostics(program, stderr)) return callback(Error("Parse error"));
+    var numErrors = checkDiagnostics(program, stderr);
+    if (numErrors) {
+      return callback(Error(numErrors + " parse error(s)"));
+    }
   }
 
   // Include runtime template before entry files so its setup runs first
@@ -570,6 +585,20 @@ exports.main = function main(argv, options, callback) {
   optimizeLevel = Math.min(Math.max(optimizeLevel, 0), 3);
   shrinkLevel = Math.min(Math.max(shrinkLevel, 0), 2);
 
+  try {
+    stats.compileTime += measure(() => {
+      assemblyscript.initializeProgram(program, compilerOptions);
+    });
+  } catch(e) {
+    return callback(e);
+  }
+
+  // Call afterInitialize transform hook
+  {
+    let error = applyTransform("afterInitialize", program);
+    if (error) return callback(error);
+  }
+
   var module;
   stats.compileCount++;
   try {
@@ -579,9 +608,10 @@ exports.main = function main(argv, options, callback) {
   } catch (e) {
     return callback(e);
   }
-  if (checkDiagnostics(program, stderr)) {
+  var numErrors = checkDiagnostics(program, stderr);
+  if (numErrors) {
     if (module) module.dispose();
-    return callback(Error("Compile error"));
+    return callback(Error(numErrors + " compile error(s)"));
   }
 
   // Call afterCompile transform hook
@@ -643,6 +673,20 @@ exports.main = function main(argv, options, callback) {
     const passes = [];
     function add(pass) { passes.push(pass); }
 
+    if (optimizeLevel >= 2 && shrinkLevel === 0) {
+      // tweak inlining options when speed more preferable than size
+      module.setAlwaysInlineMaxSize(12);
+      module.setFlexibleInlineMaxSize(70);
+      module.setOneCallerInlineMaxSize(200);
+    } else {
+      // tweak inlining options when size matters
+      optimizeLevel === 0 && shrinkLevel >= 0
+        ? module.setAlwaysInlineMaxSize(2)
+        : module.setAlwaysInlineMaxSize(4);  // default:  2
+      module.setFlexibleInlineMaxSize(65);   // default: 20
+      module.setOneCallerInlineMaxSize(80);  // default: 15
+    }
+
     // Optimize the module if requested
     if (optimizeLevel > 0 || shrinkLevel > 0) {
       // Binaryen's default passes with Post-AssemblyScript passes added.
@@ -656,9 +700,15 @@ exports.main = function main(argv, options, callback) {
         add("ssa-nomerge");
       }
       if (optimizeLevel >= 3) {
+        add("simplify-locals-nostructure"); // differs
+        add("vacuum"); // differs
+        add("reorder-locals"); // differs
         add("flatten");
         add("local-cse");
       }
+      if (optimizeLevel >= 2 || shrinkLevel >= 1) { // differs
+        add("rse");
+      }
       if (hasARC) { // differs
         if (optimizeLevel < 3) {
           add("flatten");
@@ -668,11 +718,12 @@ exports.main = function main(argv, options, callback) {
       add("dce");
       add("remove-unused-brs");
       add("remove-unused-names");
-      add("optimize-instructions");
+      // add("optimize-instructions"); // differs move 2 lines above
       if (optimizeLevel >= 2 || shrinkLevel >= 1) {
         add("pick-load-signs");
         add("simplify-globals-optimizing"); // differs
       }
+      add("optimize-instructions"); // differs
       if (optimizeLevel >= 3 || shrinkLevel >= 2) {
         add("precompute-propagate");
       } else {
@@ -682,19 +733,25 @@ exports.main = function main(argv, options, callback) {
       // if (optimizeLevel >= 2 || shrinkLevel >= 2) {
       //   add("code-pushing");
       // }
+      if (optimizeLevel >= 3 && shrinkLevel <= 1) { // differs
+        add("licm");
+      }
       add("simplify-locals-nostructure");
       add("vacuum");
       add("reorder-locals");
       add("remove-unused-brs");
-      if (optimizeLevel >= 3 || shrinkLevel >= 2) {
-        add("merge-locals");
-      }
+      // if (optimizeLevel >= 3 || shrinkLevel >= 2) { // do it later
+      //   add("merge-locals");
+      // }
       add("coalesce-locals");
       add("simplify-locals");
       add("vacuum");
       add("reorder-locals");
       add("coalesce-locals");
       add("reorder-locals");
+      if (optimizeLevel >= 3 || shrinkLevel >= 1) { // differs
+        add("merge-locals");
+      }
       add("vacuum");
       if (optimizeLevel >= 3 || shrinkLevel >= 1) {
         add("code-folding");
@@ -754,29 +811,26 @@ exports.main = function main(argv, options, callback) {
         add("remove-unused-brs");
         add("vacuum");
 
-        // replace indirect calls with direct and inline if possible again.
-        add("directize");
-        add("inlining-optimizing");
         // move some code after early return which potentially could reduce computations
         // do this after CFG cleanup (originally it was done before)
         // moved from (1)
         add("code-pushing");
-
-        // this quite expensive so do this only for highest opt level
-        add("simplify-globals-optimizing");
         if (optimizeLevel >= 3) {
-          add("simplify-locals-nostructure");
-          add("vacuum");
-
+          // this quite expensive so do this only for highest opt level
+          add("simplify-globals");
+          // replace indirect calls with direct and inline if possible again.
+          add("directize");
+          add("dae-optimizing");
           add("precompute-propagate");
+          add("coalesce-locals");
+          add("merge-locals");
           add("simplify-locals-nostructure");
           add("vacuum");
-
-          add("reorder-locals");
-        } else {
-          add("simplify-globals-optimizing");
+          add("inlining-optimizing");
+          add("precompute-propagate");
         }
         add("optimize-instructions");
+        add("simplify-globals-optimizing");
       }
       // remove unused elements of table and pack / reduce memory
       add("duplicate-function-elimination"); // differs
@@ -1023,17 +1077,17 @@ exports.main = function main(argv, options, callback) {
 /** Checks diagnostics emitted so far for errors. */
 function checkDiagnostics(program, stderr) {
   var diagnostic;
-  var hasErrors = false;
+  var numErrors = 0;
   while ((diagnostic = assemblyscript.nextDiagnostic(program)) != null) {
     if (stderr) {
       stderr.write(
         assemblyscript.formatDiagnostic(diagnostic, stderr.isTTY, true) +
         EOL + EOL
       );
     }
-    if (assemblyscript.isError(diagnostic)) hasErrors = true;
+    if (assemblyscript.isError(diagnostic)) ++numErrors;
   }
-  return hasErrors;
+  return numErrors;
 }
 
 exports.checkDiagnostics = checkDiagnostics;

cli/asc.json

@@ -167,7 +167,8 @@
     "TODO_doesNothingYet": [
       " nontrapping-f2i     Non-trapping float to integer ops.",
       " exception-handling  Exception handling.",
-      " tail-calls          Tail call operations."
+      " tail-calls          Tail call operations.",
+      " multi-value         Multi value types."
     ],
     "type": "S"
   },
@@ -191,6 +192,12 @@
     "type": "S",
     "alias": "u"
   },
+  "lowMemoryLimit": {
+    "category": "Features",
+    "description": "Enforces very low (<64k) memory constraints.",
+    "default": 0,
+    "type": "i"
+  },
 
   "memoryBase": {
     "category": "Linking",

cli/transform.d.ts

@@ -1,7 +1,7 @@
 /**
- * Definitions for custom compiler transforms that can be applied with the `--transform` option.
- * @module cli/transform
- *//***/
+ * @fileoverview Compiler transform interface definitions.
+ * @license Apache-2.0
+ */
 
 import { Program, Parser, Module } from "..";
 import { OutputStream } from "./asc";
@@ -35,6 +35,9 @@ export abstract class Transform {
   /** Called when parsing is complete, before a program is instantiated from the AST. */
   afterParse?(parser: Parser): void;
 
+  /** Called after the program is instantiated. */
+  afterInitialize?(program: Program): void;
+
   /** Called when compilation is complete, before the module is being validated. */
   afterCompile?(module: Module): void;
 }

cli/transform.js

@@ -1,2 +1,7 @@
+/**
+ * @fileoverview Compiler transform interface.
+ * @license Apache-2.0
+ */
+
 // becomes replaced with the actual base by asc
 exports.Transform = function Transform() {};

cli/util/colors.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview Terminal colors utility definitions.
+ * @license Apache-2.0
+ */
+
 interface Colors {
   /** Whether terminal colors are supported. */
   supported: boolean;

cli/util/colors.js

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview Terminal colors utility.
+ * @license Apache-2.0
+ */
+
 var proc = typeof process !== "undefined" && process || {};
 var isCI = proc.env && "CI" in proc.env; // doesn't work when bundled because 'process' is a mock
 

cli/util/find.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview File finding utility definitions.
+ * @license Apache-2.0
+ */
+
 export function files(dirname: string, filter?: ((name: string) => bool) | RegExp): string[];
 export const TS: RegExp;
 export const TS_EXCEPT_DTS: RegExp;