Skip to content

Commit

Permalink
Marshal header size change in OCaml 5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
vouillon committed Sep 13, 2024
1 parent 6d43b92 commit 805c367
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
14 changes: 12 additions & 2 deletions runtime/wasm/dune
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,19 @@

(rule
(target version-dependent.wat)
(deps version-dependent/pre-5.2.wat)
(deps version-dependent/post-5.2.wat)
(enabled_if
(and
(>= %{ocaml_version} 5.1.0)
(< %{ocaml_version} 5.2.0)))
(action
(copy %{deps} %{target})))

(rule
(target version-dependent.wat)
(deps version-dependent/pre-5.1.wat)
(enabled_if
(< %{ocaml_version} 5.2.0))
(< %{ocaml_version} 5.1.0))
(action
(copy %{deps} %{target})))

Expand Down
4 changes: 2 additions & 2 deletions runtime/wasm/marshal.wat
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
(func $caml_find_custom_operations
(param (ref $string)) (result (ref null $custom_operations))))

(global $caml_marshal_header_size (export "caml_marshal_header_size")
(mut i32) (i32.const 20))
(import "version-dependent" "caml_marshal_header_size"
(global $caml_marshal_header_size i32))

(global $input_val_from_string (ref $string)
(array.new_fixed $string 21
Expand Down
2 changes: 2 additions & 0 deletions runtime/wasm/version-dependent/post-5.2.wat
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,6 @@
(ref.i31 (i32.const 0))
(array.new_fixed $block 2 (ref.i31 (i32.const 0)) (local.get $res))))
(ref.i31 (local.get $id)))

(global (export "caml_marshal_header_size") i32 (i32.const 16))
)
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,6 @@
(global.set $caml_domain_id (local.get $old))
(drop (call $caml_ml_mutex_unlock (local.get $mutex)))
(ref.i31 (local.get $id)))

(global (export "caml_marshal_header_size") i32 (i32.const 20))
)

0 comments on commit 805c367

Please sign in to comment.