Implement reference counting

.travis.yml

@@ -3,19 +3,15 @@ notifications:
   email: false
 before_install: npm config set progress=false && npm i -g npm@latest --no-audit
 install: npm ci --no-audit
-cache:
-  directories:
-  - node_modules
 jobs:
   include:
   - node_js: lts/*
     script:
-    - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./scripts/check-pr.sh; fi
+    - if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_PULL_REQUEST_BRANCH" != "dev" ]; then ./scripts/check-pr.sh; fi
     - npm run all
     - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-        cd $TRAVIS_BUILD_DIR/tests/allocators/arena && npm run build && cd .. && npm test arena &&
-        cd $TRAVIS_BUILD_DIR/tests/allocators/buddy && npm run build && cd .. && npm test buddy &&
-        cd $TRAVIS_BUILD_DIR/tests/allocators/tlsf  && npm run build && cd .. && npm test tlsf;
+        cd $TRAVIS_BUILD_DIR/tests/allocators/rt-full && npm run build && cd .. && npm test rt-full &&
+        cd $TRAVIS_BUILD_DIR/tests/allocators/rt-stub && npm run build && cd .. && npm test rt-stub;
       fi
     env: Runs the tests on node.js LTS, also tests allocators
   - node_js: node
@@ -24,7 +20,7 @@ jobs:
     env: Runs the tests on node.js stable
   - node_js: node
     script:
-    - npm run clean && npm run test:compiler
+    - npm run clean && npm run test:compiler rt/flags threads
     env:
     - Runs experimental tests on node.js v8-canary using
     - ASC_FEATURES="simd,threads"

README.md

@@ -3,7 +3,7 @@
 
 [![Build Status](https://travis-ci.org/AssemblyScript/assemblyscript.svg?branch=master)](https://travis-ci.org/AssemblyScript/assemblyscript)
 
-**AssemblyScript** compiles strictly typed [TypeScript](http://www.typescriptlang.org) (basically JavaScript with types) to [WebAssembly](http://webassembly.org) using [Binaryen](https://github.com/WebAssembly/binaryen). It generates lean and mean WebAssembly modules while being just an `npm install` away.
+**AssemblyScript** compiles a strict subset of [TypeScript](http://www.typescriptlang.org) (basically JavaScript with types) to [WebAssembly](http://webassembly.org) using [Binaryen](https://github.com/WebAssembly/binaryen). It generates lean and mean WebAssembly modules while being just an `npm install` away.
 
 Try it out in [WebAssembly Studio](https://webassembly.studio)!
 

cli/asc.js

@@ -22,6 +22,8 @@ const optionsUtil = require("./util/options");
 const mkdirp = require("./util/mkdirp");
 const EOL = process.platform === "win32" ? "\r\n" : "\n";
 
+// global.Binaryen = require("../lib/binaryen");
+
 // Emscripten adds an `uncaughtException` listener to Binaryen that results in an additional
 // useless code fragment on top of an actual error. suppress this:
 if (process.removeAllListeners) process.removeAllListeners("uncaughtException");
@@ -68,7 +70,7 @@ exports.sourceMapRoot = "assemblyscript:///";
 exports.libraryPrefix = assemblyscript.LIBRARY_PREFIX;
 
 /** Default Binaryen optimization level. */
-exports.defaultOptimizeLevel = 2;
+exports.defaultOptimizeLevel = 3;
 
 /** Default Binaryen shrink level. */
 exports.defaultShrinkLevel = 1;
@@ -228,30 +230,18 @@ exports.main = function main(argv, options, callback) {
   var parser = null;
 
   // Include library files
-  if (!args.noLib) {
-    Object.keys(exports.libraryFiles).forEach(libPath => {
-      if (libPath.indexOf("/") >= 0) return; // in sub-directory: imported on demand
-      stats.parseCount++;
-      stats.parseTime += measure(() => {
-        parser = assemblyscript.parseFile(
-          exports.libraryFiles[libPath],
-          exports.libraryPrefix + libPath + ".ts",
-          false,
-          parser
-        );
-      });
-    });
-  } else { // always include builtins
+  Object.keys(exports.libraryFiles).forEach(libPath => {
+    if (libPath.indexOf("/") >= 0) return; // in sub-directory: imported on demand
     stats.parseCount++;
     stats.parseTime += measure(() => {
       parser = assemblyscript.parseFile(
-        exports.libraryFiles["builtins"],
-        exports.libraryPrefix + "builtins.ts",
+        exports.libraryFiles[libPath],
+        exports.libraryPrefix + libPath + ".ts",
         false,
         parser
       );
     });
-  }
+  });
   const customLibDirs = [];
   if (args.lib) {
     let lib = args.lib;
@@ -364,6 +354,22 @@ exports.main = function main(argv, options, callback) {
     }
   }
 
+  // Include runtime template before entry files so its setup runs first
+  {
+    let templateName = String(args.runtime);
+    let templateText = exports.libraryFiles["rt/index-" + templateName];
+    if (templateText == null) {
+      templateText = readFile(templateName + ".ts", baseDir);
+      if (templateText == null) {
+        return callback(Error("Runtime template '" + templateName + "' not found."));
+      }
+    }
+    stats.parseCount++;
+    stats.parseTime += measure(() => {
+      parser = assemblyscript.parseFile(templateText, templateName, true, parser);
+    });
+  }
+
   // Include entry files
   for (let i = 0, k = argv.length; i < k; ++i) {
     const filename = argv[i];
@@ -387,11 +393,18 @@ exports.main = function main(argv, options, callback) {
     stats.parseTime += measure(() => {
       parser = assemblyscript.parseFile(sourceText, sourcePath, true, parser);
     });
+  }
+
+  // Parse entry files
+  {
     let code = parseBacklog();
     if (code) return code;
   }
 
+  // Call afterParse transform hook
   applyTransform("afterParse", parser);
+
+  // Parse additional files, if any
   {
     let code = parseBacklog();
     if (code) return code;
@@ -427,13 +440,11 @@ exports.main = function main(argv, options, callback) {
   assemblyscript.setSourceMap(compilerOptions, args.sourceMap != null);
   assemblyscript.setOptimizeLevelHints(compilerOptions, optimizeLevel, shrinkLevel);
 
-  if (!args.noLib) {
-    // Initialize default aliases
-    assemblyscript.setGlobalAlias(compilerOptions, "Math", "NativeMath");
-    assemblyscript.setGlobalAlias(compilerOptions, "Mathf", "NativeMathf");
-    assemblyscript.setGlobalAlias(compilerOptions, "abort", "~lib/env/abort");
-    assemblyscript.setGlobalAlias(compilerOptions, "trace", "~lib/env/trace");
-  }
+  // 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");
 
   // Add or override aliases if specified
   if (args.use) {
@@ -463,15 +474,13 @@ exports.main = function main(argv, options, callback) {
 
   var module;
   stats.compileCount++;
-  (() => {
-    try {
-      stats.compileTime += measure(() => {
-        module = assemblyscript.compileProgram(program, compilerOptions);
-      });
-    } catch (e) {
-      return callback(e);
-    }
-  })();
+  try {
+    stats.compileTime += measure(() => {
+      module = assemblyscript.compileProgram(program, compilerOptions);
+    });
+  } catch (e) {
+    return callback(e);
+  }
   if (checkDiagnostics(parser, stderr)) {
     if (module) module.dispose();
     return callback(Error("Compile error"));

cli/asc.json

@@ -13,7 +13,7 @@
     "description": [
       "Optimizes the module. Also has the usual shorthands:",
       "",
-      " -O     Uses defaults. Equivalent to -O2s",
+      " -O     Uses defaults. Equivalent to -O3s",
       " -O0    Equivalent to --optimizeLevel 0",
       " -O1    Equivalent to --optimizeLevel 1",
       " -O2    Equivalent to --optimizeLevel 2",
@@ -81,6 +81,19 @@
     ],
     "type": "s"
   },
+  "runtime": {
+    "description": [
+      "Specifies the runtime implementation to include in the program.",
+      "",
+      " full  Default runtime based on TLSF and reference counting.",
+      " half  Same as 'full', but not exported to the host.",
+      " stub  Minimal stub implementation without free/GC support.",
+      " none  Same as 'stub', but not exported to the host.",
+      ""
+    ],
+    "type": "s",
+    "default": "full"
+  },
   "debug": {
     "description": "Enables debug information in emitted binaries.",
     "type": "b",
@@ -116,11 +129,6 @@
     "type": "b",
     "default": false
   },
-  "noLib": {
-    "description": "Does not include the shipped standard library.",
-    "type": "b",
-    "default": false
-  },
   "lib": {
     "description": [
       "Adds one or multiple paths to custom library components and",

examples/game-of-life/build/optimized.wat

@@ -8,13 +8,10 @@
  (import "config" "BGR_ALIVE" (global $assembly/config/BGR_ALIVE i32))
  (import "config" "BIT_ROT" (global $assembly/config/BIT_ROT i32))
  (import "Math" "random" (func $~lib/bindings/Math/random (result f64)))
- (table $0 1 funcref)
- (elem (i32.const 0) $null)
  (global $assembly/index/w (mut i32) (i32.const 0))
  (global $assembly/index/h (mut i32) (i32.const 0))
  (global $assembly/index/s (mut i32) (i32.const 0))
  (export "memory" (memory $0))
- (export "table" (table $0))
  (export "init" (func $assembly/index/init))
  (export "step" (func $assembly/index/step))
  (export "fill" (func $assembly/index/fill))
@@ -136,7 +133,7 @@
       local.get $7
       local.get $1
       select
-      local.tee $2
+      local.tee $3
       global.get $assembly/index/w
       local.get $4
       i32.mul
@@ -165,7 +162,7 @@
       local.get $7
       i32.eq
       select
-      local.tee $3
+      local.tee $2
       global.get $assembly/index/w
       local.get $4
       i32.mul
@@ -179,7 +176,7 @@
       global.get $assembly/index/w
       local.get $0
       i32.mul
-      local.get $2
+      local.get $3
       i32.add
       i32.const 2
       i32.shl
@@ -190,7 +187,7 @@
       global.get $assembly/index/w
       local.get $0
       i32.mul
-      local.get $3
+      local.get $2
       i32.add
       i32.const 2
       i32.shl
@@ -201,7 +198,7 @@
       global.get $assembly/index/w
       local.get $5
       i32.mul
-      local.get $2
+      local.get $3
       i32.add
       i32.const 2
       i32.shl
@@ -223,7 +220,7 @@
       global.get $assembly/index/w
       local.get $5
       i32.mul
-      local.get $3
+      local.get $2
       i32.add
       i32.const 2
       i32.shl