WIP

ocaml-wasm · Oct 3, 2024 · b0cadb1 · b0cadb1
1 parent 4985ad1
commit b0cadb1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/build-wasm_of_ocaml.yml b/.github/workflows/build-wasm_of_ocaml.yml
@@ -114,6 +114,13 @@ jobs:
         with:
           path: wasm_of_ocaml
 
+      - name: Pin faked binaryen-bin package
+        with:
+          path: faked-binaryen-bin
+        run: |
+          echo opam-version: '"2.0"' > binaryen-bin.opam
+          opam pin -n .
+
       - name: Checkout Jane Street opam repository
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -98,7 +98,9 @@ jobs:
       - run: opam pin --with-version `< VERSION` . --best-effort
         if: ${{ matrix.skip-test }}
 
-      - run: opam pin --with-version `< VERSION`
+      - run: |
+          opam pin --with-version `< VERSION` .
+          opam install . --deps-only --with-test
         if: ${{ !matrix.skip-test }}
 
       - run: opam exec -- make all

diff --git a/runtime/wasm/bigarray.wat b/runtime/wasm/bigarray.wat
@@ -2137,7 +2137,7 @@
                   (ref.i31 (array.get $string (local.get $s) (local.get $i))))
                (local.set $i (i32.add (local.get $i) (i32.const 1)))
                (br $loop))))
-      (call $wrap (extern.internalize (local.get $ta))))
+      (call $wrap (any.convert_extern (local.get $ta))))
 
    (func (export "caml_ba_get_kind") (param (ref eq)) (result i32)
       (struct.get $bigarray $ba_kind (ref.cast (ref $bigarray) (local.get 0))))

diff --git a/runtime/wasm/stdlib.wat b/runtime/wasm/stdlib.wat
@@ -54,7 +54,7 @@
          (field (mut (ref eq)))
          (field (mut (ref null $assoc)))))
 
-   (type $assoc_array (array (field (mut (ref null $assoc)))))
+   (type $assoc_array (array (mut (ref null $assoc))))
 
    (global $Named_value_size i32 (i32.const 13))