warpo 3.3.0 → 3.4.0

package/asconfig.schema.json

@@ -89,7 +89,15 @@
           "items": {
             "type": "string",
             "description": "Name of a feature to disable.",
-            "enum": ["mutable-globals", "sign-extension", "nontrapping-f2i", "bulk-memory", "multi-value", "tail-call"]
+            "enum": [
+              "mutable-globals",
+              "sign-extension",
+              "nontrapping-f2i",
+              "bulk-memory",
+              "multi-value",
+              "tail-call",
+              "return-to-br"
+            ]
           }
         },
         "enable": {
@@ -98,7 +106,15 @@
           "items": {
             "type": "string",
             "description": "Name of a feature to enable.",
-            "enum": ["mutable-globals", "sign-extension", "nontrapping-f2i", "bulk-memory", "multi-value", "tail-call"]
+            "enum": [
+              "mutable-globals",
+              "sign-extension",
+              "nontrapping-f2i",
+              "bulk-memory",
+              "multi-value",
+              "tail-call",
+              "return-to-br"
+            ]
           }
         },
         "debug": {

package/assemblyscript/std/assembly/map.ts

@@ -57,6 +57,41 @@ function ENTRY_SIZE<K, V>(): usize {
   return size;
 }
 
+/**
+ * Forward-only history of entries layouts: the map keeps the latest version,
+ * while each iterator keeps the version matching its cursor. Old versions retain
+ * removed slot indices, not obsolete entries buffers or references to their contents.
+ */
+class MapIteratorVersion {
+  private nextVersion: MapIteratorVersion | null = null;
+  // For versions with a successor, null marks clear(); otherwise indices are sorted in the old layout.
+  private removedIndices: StaticArray<i32> | null = null;
+
+  transition(removedIndices: StaticArray<i32> | null): MapIteratorVersion {
+    this.removedIndices = removedIndices;
+    return (this.nextVersion = new MapIteratorVersion());
+  }
+
+  translateIndex(index: i32): i32 {
+    const removedIndices = this.removedIndices;
+    if (!removedIndices) return 0;
+    // New cursor = old cursor - number of removed slots strictly before it.
+    // A removed slot at index is unvisited and must not move the boundary backward.
+    let lower = 0;
+    let upper = removedIndices.length;
+    while (lower < upper) {
+      const middle = lower + ((upper - lower) >> 1);
+      if (unchecked(removedIndices[middle]) < index) lower = middle + 1;
+      else upper = middle;
+    }
+    return index - lower;
+  }
+
+  getNext(): MapIteratorVersion {
+    return assert(this.nextVersion);
+  }
+}
+
 // @ts-ignore: decorator
 @lazy
 const GET_START = Symbol();
@@ -65,11 +100,33 @@ const GET_START = Symbol();
 @lazy
 const GET_ENTRIES_OFFSET = Symbol();
 
+// @ts-ignore: decorator
+@lazy
+const GET_ITERATOR_VERSION = Symbol();
+
 class MapIterator<K, V> implements Iterator<[K, V]> {
+  // Next physical slot in this.version's layout, not the number of values returned.
   private i: i32 = 0;
-  constructor(private map: Map<K, V>) {}
+  private map: Map<K, V> | null;
+  private version: MapIteratorVersion | null;
+
+  constructor(map: Map<K, V>) {
+    this.map = map;
+    this.version = map[GET_ITERATOR_VERSION]();
+  }
+
   next(): IteratorResult<[K, V]> {
     const map = this.map;
+    if (!map) return IteratorResult.done<[K, V]>();
+    // Apply every missed compaction or clear before accessing the current entries buffer.
+    const currentVersion = map[GET_ITERATOR_VERSION]();
+    let version = assert(this.version);
+    while (version != currentVersion) {
+      this.i = version.translateIndex(this.i);
+      version = version.getNext();
+    }
+    this.version = version;
+
     const start = map[GET_START]();
     const size = map[GET_ENTRIES_OFFSET]();
     for (let i = this.i; i < size; ++i) {
@@ -79,6 +136,10 @@ class MapIterator<K, V> implements Iterator<[K, V]> {
         return IteratorResult.fromValue<[K, V]>([entry.key, entry.value]);
       }
     }
+    // Once done, later insertions must not revive this iterator.
+    // Release the map and any layout history still retained by this iterator.
+    this.map = null;
+    this.version = null;
     return IteratorResult.done<[K, V]>();
   }
 }
@@ -93,6 +154,8 @@ export class Map<K, V> implements Iterable<[K, V]> {
   private entriesCapacity: i32 = INITIAL_CAPACITY;
   private entriesOffset: i32 = 0;
   private entriesCount: i32 = 0;
+  // Lazy state: maps that never create iterators need no layout-change history.
+  private iteratorVersion: MapIteratorVersion | null = null;
 
   constructor() {
     /* nop */
@@ -107,6 +170,12 @@ export class Map<K, V> implements Iterable<[K, V]> {
   [GET_ENTRIES_OFFSET](): i32 {
     return this.entriesOffset;
   }
+  @inline
+  [GET_ITERATOR_VERSION](): MapIteratorVersion {
+    let iteratorVersion = this.iteratorVersion;
+    if (!iteratorVersion) this.iteratorVersion = iteratorVersion = new MapIteratorVersion();
+    return iteratorVersion;
+  }
 
   get size(): i32 {
     return this.entriesCount;
@@ -116,6 +185,9 @@ export class Map<K, V> implements Iterable<[K, V]> {
     this.buckets = new ArrayBuffer(INITIAL_CAPACITY * <i32>BUCKET_SIZE);
     this.bucketsMask = INITIAL_CAPACITY - 1;
     this.entries = new ArrayBuffer(INITIAL_CAPACITY * <i32>ENTRY_SIZE<K, V>());
+    // Live iterators must restart at entries inserted after clear(), rather than keep their old indices.
+    let iteratorVersion = this.iteratorVersion;
+    if (iteratorVersion) this.iteratorVersion = iteratorVersion.transition(null);
     this.entriesCapacity = INITIAL_CAPACITY;
     this.entriesOffset = 0;
     this.entriesCount = 0;
@@ -206,9 +278,17 @@ export class Map<K, V> implements Iterable<[K, V]> {
     let newEntries = new ArrayBuffer(newEntriesCapacity * <i32>ENTRY_SIZE<K, V>());
 
     // copy old entries to new entries
-    let oldPtr = changetype<usize>(this.entries);
+    let oldStart = changetype<usize>(this.entries);
+    let oldPtr = oldStart;
     let oldEnd = oldPtr + <usize>this.entriesOffset * ENTRY_SIZE<K, V>();
     let newPtr = changetype<usize>(newEntries);
+    let iteratorVersion = this.iteratorVersion;
+    // Record deleted slots only if iterator state exists; growth without holes leaves indices unchanged.
+    let removedIndices: StaticArray<i32> | null =
+      iteratorVersion && this.entriesOffset != this.entriesCount
+        ? new StaticArray<i32>(this.entriesOffset - this.entriesCount)
+        : null;
+    let removedCount = 0;
     while (oldPtr != oldEnd) {
       let oldEntry = changetype<MapEntry<K, V>>(oldPtr);
       if (!(oldEntry.taggedNext & EMPTY)) {
@@ -221,6 +301,9 @@ export class Map<K, V> implements Iterable<[K, V]> {
         newEntry.taggedNext = load<usize>(newBucketPtrBase);
         store<usize>(newBucketPtrBase, newPtr);
         newPtr += ENTRY_SIZE<K, V>();
+      } else if (removedIndices) {
+        // Old slots are scanned in order, keeping the indices sorted for the lower-bound search.
+        unchecked((removedIndices[removedCount++] = <i32>((oldPtr - oldStart) / ENTRY_SIZE<K, V>())));
       }
       oldPtr += ENTRY_SIZE<K, V>();
     }
@@ -228,6 +311,7 @@ export class Map<K, V> implements Iterable<[K, V]> {
     this.buckets = newBuckets;
     this.bucketsMask = newBucketsMask;
     this.entries = newEntries;
+    if (iteratorVersion && removedIndices) this.iteratorVersion = iteratorVersion.transition(removedIndices);
     this.entriesCapacity = newEntriesCapacity;
     this.entriesOffset = this.entriesCount;
   }
@@ -276,6 +360,9 @@ export class Map<K, V> implements Iterable<[K, V]> {
 
   @unsafe private __visit(cookie: u32): void {
     __visit(changetype<usize>(this.buckets), cookie);
+    // Map uses a custom visitor, so its managed iterator-version field must be traced explicitly.
+    let iteratorVersion = this.iteratorVersion;
+    if (iteratorVersion) __visit(changetype<usize>(iteratorVersion), cookie);
     let entries = changetype<usize>(this.entries);
     if (isManaged<K>() || isManaged<V>()) {
       let cur = entries;

package/create/resolveModule.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import * as api from "./__warpo_create";
+import { memory_expose } from "warpo/memory";
 
 export class ModuleResolve {
   packageName!: string;
@@ -13,5 +14,6 @@ export class ModuleResolve {
 
 export type Fn = (task: ModuleResolve) => void;
 export function onModuleResolve(fn: Fn): void {
+  memory_expose<ModuleResolve>();
   api.onModuleResolve(fn.index, idof<ModuleResolve>());
 }

package/dist/test_runner/core/compiler.js

@@ -17,6 +17,7 @@ async function buildWithWARPO({ sources, output, userDefinedFlags, collectCovera
         "--debug",
         "--enable-feature",
         "tail-call",
+        "return-to-br",
         // instrumentation flags
         "--instrument",
     ];

package/dist/test_runner/core/compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../tools/test_runner/core/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,sBAAsB,CAAC;AAG9C,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC,YAAY,YAAgC;QAC1C,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AAED,KAAK,UAAU,cAAc,CAAC,EAC5B,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,eAAe,GACG;IAClB,IAAI,SAAS,GAAG;QACd,GAAG,OAAO;QACV,IAAI;QACJ,MAAM,CAAC,IAAI;QACX,eAAe;QACf,wDAAwD;QACxD,eAAe;QACf,mBAAmB;QACnB,SAAS;QACT,kBAAkB;QAClB,WAAW;QACX,wBAAwB;QACxB,cAAc;KACf,CAAC;IACF,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,SAAS,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,2CAA2C;QAC3C,iCAAiC;QACjC,8EAA8E;QAC9E,gDAAgD;QAChD,MAAM,IAAI,GAAG,gBAAgB;aAC1B,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aACzC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC;aACpC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC;aAC9B,KAAK,CAAC,GAAG,CAAC,CAAC;QACd,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;QACnC,IAAI,EAAE,SAAS;KAChB,CAAC,CAAC;IACH,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AASD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAAyB;IACzD,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../tools/test_runner/core/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,sBAAsB,CAAC;AAG9C,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC,YAAY,YAAgC;QAC1C,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AAED,KAAK,UAAU,cAAc,CAAC,EAC5B,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,eAAe,GACG;IAClB,IAAI,SAAS,GAAG;QACd,GAAG,OAAO;QACV,IAAI;QACJ,MAAM,CAAC,IAAI;QACX,eAAe;QACf,wDAAwD;QACxD,eAAe;QACf,mBAAmB;QACnB,SAAS;QACT,kBAAkB;QAClB,WAAW;QACX,cAAc;QACd,wBAAwB;QACxB,cAAc;KACf,CAAC;IACF,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,SAAS,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,2CAA2C;QAC3C,iCAAiC;QACjC,8EAA8E;QAC9E,gDAAgD;QAChD,MAAM,IAAI,GAAG,gBAAgB;aAC1B,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aACzC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC;aACpC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC;aAC9B,KAAK,CAAC,GAAG,CAAC,CAAC;QACd,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;QACnC,IAAI,EAAE,SAAS;KAChB,CAAC,CAAC;IACH,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AASD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAAyB;IACzD,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "warpo",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "next generation AssemblyScript compiler with optimizations",
   "type": "module",
   "bin": {

package/types/warpo/index.d.ts

@@ -8,6 +8,10 @@ declare module "warpo/ffi" {
   }
 }
 
+declare module "warpo/memory" {
+  function memory_expose<T>(): void;
+}
+
 declare module "rt/index" {
   // allocate new object with size and rtid
   function __new(size: usize, id: u32): usize;

package/warpo_extension/std/warpo/memory.ts

@@ -0,0 +1,6 @@
+// Copyright (C) 2026 wasm-ecosystem
+// SPDX-License-Identifier: Apache-2.0
+
+// @ts-ignore: decorator
+@builtin
+export declare function memory_expose<T>(): void;