AssemblyScript · dcodeIO · Jan 28, 2021 · Nov 24, 2020 · Nov 24, 2020 · Nov 24, 2020
diff --git a/cli/asc.js b/cli/asc.js
@@ -1148,17 +1148,20 @@ exports.getAsconfig = getAsconfig;
 
 /** Checks diagnostics emitted so far for errors. */
 function checkDiagnostics(program, stderr) {
-  var diagnostic;
   var numErrors = 0;
-  while ((diagnostic = assemblyscript.nextDiagnostic(program))) {
+  do {
+    let diagnosticPtr = assemblyscript.nextDiagnostic(program);
+    if (!diagnosticPtr) break;
+    __pin(diagnosticPtr);
     if (stderr) {
       stderr.write(
-        __getString(assemblyscript.formatDiagnostic(diagnostic, stderr.isTTY, true)) +
+        __getString(assemblyscript.formatDiagnostic(diagnosticPtr, stderr.isTTY, true)) +
         EOL + EOL
       );
     }
-    if (assemblyscript.isError(diagnostic)) ++numErrors;
-  }
+    if (assemblyscript.isError(diagnosticPtr)) ++numErrors;
+    __unpin(diagnosticPtr);
+  } while (true);
   return numErrors;
 }
 

diff --git a/std/assembly/array.ts b/std/assembly/array.ts
@@ -19,7 +19,7 @@ function ensureSize(array: usize, minSize: usize, alignLog2: u32): void {
     if (newData !== oldData) { // oldData has been free'd
       store<usize>(array, newData, offsetof<ArrayBufferView>("buffer"));
       store<usize>(array, newData, offsetof<ArrayBufferView>("dataStart"));
-      // new buffer inherits old buffer's state, so no need to link
+      __link(array, changetype<usize>(newData), false);
     }
     store<u32>(array, newCapacity, offsetof<ArrayBufferView>("byteLength"));
   }

diff --git a/std/assembly/rt/itcms.ts b/std/assembly/rt/itcms.ts
@@ -145,14 +145,18 @@ function initLazy(space: Object): Object {
 /** Visits all objects considered to be program roots. */
 function visitRoots(cookie: u32): void {
   __visit_globals(cookie);
-  let iter = pinSpace.next;
+  var iter = pinSpace.next;
   while (iter != pinSpace) {
     __visit_members(changetype<usize>(iter) + TOTAL_OVERHEAD, cookie);
     iter = iter.next;
   }
-  let ptr = __stack_pointer;
+}
+
+/** Visits all objects on the stack. */
+function visitStack(cookie: u32): void {
+  var ptr = __stack_pointer;
   while (ptr < __heap_base) {
-    __visit(load<usize>(ptr), VISIT_SCAN);
+    __visit(load<usize>(ptr), cookie);
     ptr += sizeof<usize>();
   }
 }
@@ -176,6 +180,7 @@ function step(): usize {
         __visit_members(changetype<usize>(obj) + TOTAL_OVERHEAD, VISIT_SCAN);
       } else {
         visitRoots(VISIT_SCAN);
+        visitStack(VISIT_SCAN);
         obj = iter.next;
         if (obj == toSpace) { // done
           let from = fromSpace;
@@ -194,7 +199,7 @@ function step(): usize {
         iter = obj.next;
         if (DEBUG) assert(obj.color == i32(!white)); // old white
         free(obj);
-        return 1;
+        return 10;
       }
       toSpace.nextWithColor = changetype<usize>(toSpace);
       toSpace.prev = toSpace;
@@ -225,7 +230,8 @@ function free(obj: Object): void {
 @global @unsafe
 export function __new(size: usize, id: i32): usize {
   if (size >= OBJECT_MAXSIZE) throw new Error("allocation too large");
-  maybeStep();
+  if (total >= threshold) run();
+  else step();
   var obj = changetype<Object>(__alloc(OBJECT_OVERHEAD + size) - BLOCK_OVERHEAD);
   obj.rtId = id;
   obj.rtSize = <u32>size;
@@ -354,10 +360,9 @@ export function __collect(): void {
 @lazy var threshold: usize = GRANULARITY;
 
 /** Performs a reasonable amount of incremental GC steps. */
-function maybeStep(): void {
-  if (total < threshold) return;
+function run(): void {
   if (TRACE) trace("GC (auto) at", 1, total);
-  let limit: isize = GRANULARITY * EAGERNESS / 100;
+  var limit: isize = GRANULARITY * EAGERNESS / 100;
   do {
     limit -= step();
     if (state == STATE_IDLE) {

diff --git a/tests/compiler/extends-baseaggregate.untouched.wat b/tests/compiler/extends-baseaggregate.untouched.wat
@@ -3393,6 +3393,10 @@
     local.get $0
     local.get $6
     i32.store offset=4
+    local.get $0
+    local.get $6
+    i32.const 0
+    call $~lib/rt/tcms/__link
    end
    local.get $0
    local.get $5

diff --git a/tests/compiler/std-wasi/process.untouched.wat b/tests/compiler/std-wasi/process.untouched.wat
@@ -5181,6 +5181,10 @@
     local.get $0
     local.get $6
     i32.store offset=4
+    local.get $0
+    local.get $6
+    i32.const 0
+    call $~lib/rt/tcms/__link
    end
    local.get $0
    local.get $5

diff --git a/tests/compiler/std/array.untouched.wat b/tests/compiler/std/array.untouched.wat
@@ -4388,6 +4388,10 @@
     local.get $0
     local.get $6
     i32.store offset=4
+    local.get $0
+    local.get $6
+    i32.const 0
+    call $~lib/rt/tcms/__link
    end
    local.get $0
    local.get $5

diff --git a/tests/compiler/std/map.untouched.wat b/tests/compiler/std/map.untouched.wat
@@ -3956,6 +3956,10 @@
     local.get $0
     local.get $6
     i32.store offset=4
+    local.get $0
+    local.get $6
+    i32.const 0
+    call $~lib/rt/tcms/__link
    end
    local.get $0
    local.get $5

diff --git a/tests/compiler/std/set.untouched.wat b/tests/compiler/std/set.untouched.wat
@@ -3888,6 +3888,10 @@
     local.get $0
     local.get $6
     i32.store offset=4
+    local.get $0
+    local.get $6
+    i32.const 0
+    call $~lib/rt/tcms/__link
    end
    local.get $0
    local.get $5

diff --git a/tests/compiler/std/static-array.untouched.wat b/tests/compiler/std/static-array.untouched.wat
@@ -3329,6 +3329,9 @@
    end
   end
  )
+ (func $~lib/rt/tcms/__link (param $0 i32) (param $1 i32) (param $2 i32)
+  nop
+ )
  (func $~lib/array/ensureSize (param $0 i32) (param $1 i32) (param $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -3385,6 +3388,10 @@
     local.get $0
     local.get $6
     i32.store offset=4
+    local.get $0
+    local.get $6
+    i32.const 0
+    call $~lib/rt/tcms/__link
    end
    local.get $0
    local.get $5

diff --git a/tests/compiler/std/string.untouched.wat b/tests/compiler/std/string.untouched.wat
@@ -8111,6 +8111,10 @@
     local.get $0
     local.get $6
     i32.store offset=4
+    local.get $0
+    local.get $6
+    i32.const 0
+    call $~lib/rt/tcms/__link
    end
    local.get $0
    local.get $5