feat: add fixed-length list support and update related functionality

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

.github/workflows/macos.yml

@@ -1,17 +1,15 @@
 name: MacOS
 
-# Disabled: Known to fail
-# To re-enable, uncomment the 'on:' section below
 on:
-  workflow_dispatch:  # Manual trigger only
-#  push:
-#    branches:
-#      - trunk
-#      - main
-#  pull_request:
-#    branches:
-#      - trunk
-#      - main
+  push:
+    branches:
+      - trunk
+      - main
+  pull_request:
+    branches:
+      - trunk
+      - main
+  workflow_dispatch:
 
 env:
   CTEST_OUTPUT_ON_FAILURE: 1
@@ -43,8 +41,8 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Cache vcpkg registry
-        uses: actions/cache@v4
+      - name: Restore vcpkg registry
+        uses: actions/cache/restore@v4
         with:
           path: |
             build/vcpkg_installed/
@@ -81,6 +79,15 @@ jobs:
           echo "Running wit-stub-generation-test (failures expected and will be reported)..."
           ctest -VV -R "wit-stub-generation-test"
 
+      - name: Save vcpkg registry
+        if: always()
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            build/vcpkg_installed/
+            build/vcpkg_packages/
+          key: ${{ runner.os }}-vcpkg-${{ hashFiles('./vcpkg*.json') }}
+
       - name: Upload error logs
         if: ${{ failure() || cancelled() }}
         uses: actions/upload-artifact@v4

.github/workflows/release.yml

@@ -93,9 +93,8 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Cache vcpkg registry
-        if: always()
-        uses: actions/cache@v4
+      - name: Restore vcpkg registry
+        uses: actions/cache/restore@v4
         with:
           path: |
             build/vcpkg_installed/
@@ -116,6 +115,15 @@ jobs:
         run: |
           cmake --build --preset ${{ matrix.build-preset }}
 
+      - name: Save vcpkg registry
+        if: always()
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            build/vcpkg_installed/
+            build/vcpkg_packages/
+          key: ${{ runner.os }}-vcpkg-${{ hashFiles('./vcpkg*.json') }}
+
       - name: Create Packages
         working-directory: build
         run: |

.github/workflows/ubuntu.yml

@@ -26,6 +26,7 @@ jobs:
       matrix:
         include:
           - os: "ubuntu-24.04"
+          - os: "ubuntu-26.04"
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -44,18 +45,17 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Cache vcpkg registry
-        if: always()
-        uses: actions/cache@v4
+      - name: Restore vcpkg registry
+        uses: actions/cache/restore@v4
         with:
           path: |
             build/vcpkg_installed/
             build/vcpkg_packages/
-          key: ${{ runner.os }}-vcpkg-${{ hashFiles('./vcpkg*.json') }}
+          key: ${{ matrix.os }}-vcpkg-${{ hashFiles('./vcpkg*.json') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-
+            ${{ matrix.os }}-vcpkg-
 
       - name: install dependencies
         run: |
@@ -89,6 +89,15 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
+      - name: Save vcpkg registry
+        if: always()
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            build/vcpkg_installed/
+            build/vcpkg_packages/
+          key: ${{ matrix.os }}-vcpkg-${{ hashFiles('./vcpkg*.json') }}
+
       - name: Upload error logs
         if: ${{ failure() || cancelled() }}
         uses: actions/upload-artifact@v4

.github/workflows/windows.yml

@@ -48,8 +48,8 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Cache vcpkg registry
-        uses: actions/cache@v4
+      - name: Restore vcpkg registry
+        uses: actions/cache/restore@v4
         with:
           path: |
             build/vcpkg_installed/
@@ -89,6 +89,15 @@ jobs:
           Set-Location "$env:SHORT_WORKSPACE/build"
           & ctest -C Debug -VV
 
+      - name: Save vcpkg registry
+        if: always()
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            build/vcpkg_installed/
+            build/vcpkg_packages/
+          key: ${{ runner.os }}-vcpkg-${{ hashFiles('./vcpkg*.json') }}
+
       - name: Remove short workspace mapping
         if: always()
         run: |

README.md

@@ -16,6 +16,7 @@ This repository contains a C++ ABI implementation of the WebAssembly Component M
 
 ### OS
 - [x] Ubuntu 24.04
+- [x] Ubuntu 26.04
 - [ ] MacOS 13
 - [ ] MacOS 14 (Arm)
 - [ ] Windows 2019
@@ -36,6 +37,7 @@ This repository contains a C++ ABI implementation of the WebAssembly Component M
 - [x] Char
 - [x] Strings (UTF-8, UTF-16, Latin-1+UTF-16)
 - [x] List
+- [x] Fixed-length list (`cmcpp::fixed_list_t<T, N>`)
 - [x] Map
 - [x] Record
 - [x] Tuple

docs/spec-alignment.md

@@ -2,6 +2,7 @@
 
 This document tracks alignment between the upstream Component Model spec/reference (in `ref/component-model`) and this library’s C++ entrypoints.
 
+- Upstream baseline: `2bed77e4228841c1d2721996d3ecc169ff96b158`
 - Upstream references:
   - `ref/component-model/design/mvp/CanonicalABI.md`
   - `ref/component-model/design/mvp/Concurrency.md`
@@ -53,11 +54,11 @@ This document tracks alignment between the upstream Component Model spec/referen
 
 ## Thread built-ins (upstream)
 
-These are referenced by the upstream spec/reference but do not currently have direct C++ canonical built-in entrypoints in this repo:
+These additional thread built-ins are implemented by direct C++ canonical entrypoints:
 
-- `thread.new_ref` / `thread.new-ref` (implemented: `cmcpp::canon_thread_new_ref`)
-- `thread.new-indirect` (implemented: `cmcpp::canon_thread_new_indirect`)
-- `thread.spawn-ref` (implemented: `cmcpp::canon_thread_spawn_ref`)
-- `thread.spawn-indirect` (implemented: `cmcpp::canon_thread_spawn_indirect`)
-- `thread.switch-to` (implemented: `cmcpp::canon_thread_switch_to`)
-- `thread.available-parallelism` (implemented: `cmcpp::canon_thread_available_parallelism`)
+- `thread.new-ref`: `cmcpp::canon_thread_new_ref`
+- `thread.new-indirect`: `cmcpp::canon_thread_new_indirect`
+- `thread.spawn-ref`: `cmcpp::canon_thread_spawn_ref`
+- `thread.spawn-indirect`: `cmcpp::canon_thread_spawn_indirect`
+- `thread.switch-to`: `cmcpp::canon_thread_switch_to`
+- `thread.available-parallelism`: `cmcpp::canon_thread_available_parallelism`

grammar/Wit.g4

@@ -57,6 +57,7 @@ importItem
 externType
   : funcType ';'
   | 'interface' '{' interfaceItems* '}'
+  | usePath ';'
   ;
 
 // Item: include ---
@@ -352,6 +353,9 @@ keyword
 Identifier: LETTER (LETTER | DIGIT | '-')*
   ;
 
+NUM_ID: '0' | POSITIVE_DIGIT | POSITIVE_DIGIT DIGITS
+  ;
+
 // Semver:  https://semver.org/
 VALID_SEMVER
   : VERSION_CORE
@@ -401,9 +405,6 @@ ALPHANUM_ID
   | ID_CHARS NON_DIGIT ID_CHARS
   ;
 
-NUM_ID: '0' | POSITIVE_DIGIT | POSITIVE_DIGIT DIGITS
-  ;
-
 ID_CHARS: ID_CHAR | ID_CHAR ID_CHARS
   ;
 

include/cmcpp.hpp

@@ -12,6 +12,7 @@
 #include <cmcpp/tuple.hpp>
 #include <cmcpp/record.hpp>
 #include <cmcpp/list.hpp>
+#include <cmcpp/fixed_list.hpp>
 #include <cmcpp/map.hpp>
 #include <cmcpp/variant.hpp>
 #include <cmcpp/func.hpp>

include/cmcpp/fixed_list.hpp

@@ -0,0 +1,60 @@
+#ifndef CMCPP_FIXED_LIST_HPP
+#define CMCPP_FIXED_LIST_HPP
+
+#include "context.hpp"
+#include "lift.hpp"
+#include "load.hpp"
+#include "lower.hpp"
+#include "store.hpp"
+
+namespace cmcpp
+{
+    template <FixedList T>
+    inline void store(LiftLowerContext &cx, const T &values, uint32_t ptr)
+    {
+        using Element = typename ValTrait<T>::inner_type;
+        for (size_t i = 0; i < values.size(); ++i)
+        {
+            cmcpp::store(cx, values[i], ptr + i * ValTrait<Element>::size);
+        }
+    }
+
+    template <FixedList T>
+    inline WasmValVector lower_flat(LiftLowerContext &cx, const T &values)
+    {
+        WasmValVector flat;
+        flat.reserve(ValTrait<T>::flat_types_len);
+        for (const auto &value : values)
+        {
+            auto element_flat = cmcpp::lower_flat(cx, value);
+            flat.insert(flat.end(), element_flat.begin(), element_flat.end());
+        }
+        return flat;
+    }
+
+    template <FixedList T>
+    inline T load(const LiftLowerContext &cx, uint32_t ptr)
+    {
+        using Element = typename ValTrait<T>::inner_type;
+        T values{};
+        for (size_t i = 0; i < values.size(); ++i)
+        {
+            values[i] = cmcpp::load<Element>(cx, ptr + i * ValTrait<Element>::size);
+        }
+        return values;
+    }
+
+    template <FixedList T>
+    inline T lift_flat(const LiftLowerContext &cx, const CoreValueIter &vi)
+    {
+        using Element = typename ValTrait<T>::inner_type;
+        T values{};
+        for (auto &value : values)
+        {
+            value = cmcpp::lift_flat<Element>(cx, vi);
+        }
+        return values;
+    }
+}
+
+#endif

include/cmcpp/lift.hpp

@@ -28,6 +28,9 @@ namespace cmcpp
     template <List T>
     inline T lift_flat(const LiftLowerContext &cx, const CoreValueIter &vi);
 
+    template <FixedList T>
+    inline T lift_flat(const LiftLowerContext &cx, const CoreValueIter &vi);
+
     template <Flags T>
     inline T lift_flat(const LiftLowerContext &cx, const CoreValueIter &vi);