OxCaml: recursive value involving mixed blocks

The primitive caml_alloc_dummy_mixed is used in this case.

Author: vouillon

compiler/lib/generate.ml

@@ -1348,8 +1348,10 @@ let _ =
     ]
     `Mutator
     (fun cx cy cz _ -> J.EBin (J.Eq, Mlvalue.Array.field cx cy, cz));
-  register_un_prims [ "caml_alloc_dummy"; "caml_alloc_dummy_float" ] `Pure (fun _ _ ->
-      J.array []);
+  register_un_prims
+    [ "caml_alloc_dummy"; "caml_alloc_dummy_float"; "caml_alloc_dummy_mixed" ]
+    `Pure
+    (fun _ _ -> J.array []);
   register_un_prims
     [ "caml_int_of_float"
     ; "caml_int32_of_float"

compiler/tests-oxcaml/misc/.ocamlformat

@@ -0,0 +1 @@
+disable

compiler/tests-oxcaml/misc/dune

@@ -0,0 +1,10 @@
+(env
+ (_
+  (flags
+   (:standard
+    (-w -32-69)))))
+
+(tests
+ (names test)
+ (build_if %{oxcaml_supported})
+ (modes byte js wasm))

compiler/tests-oxcaml/misc/test.ml

@@ -0,0 +1,4 @@
+
+type t = { x : t; y : float32# }
+
+let rec x = { x; y = #0.s }

runtime/wasm/obj.wat

@@ -135,6 +135,12 @@
       (array.new $float_array (f64.const 0)
          (i31.get_u (ref.cast (ref i31) (local.get $size)))))
 
+   (func (export "caml_alloc_dummy_mixed")
+      (param $size (ref eq)) (param (ref eq)) (result (ref eq))
+      (array.new $block (ref.i31 (i32.const 0))
+                 (i32.add (i31.get_u (ref.cast (ref i31) (local.get $size)))
+                          (i32.const 1))))
+
    (func (export "caml_update_dummy")
       (param $dummy (ref eq)) (param $newval (ref eq)) (result (ref eq))
       (local $i i32)

toplevel/examples/lwt_toplevel/dune

@@ -158,7 +158,7 @@
      "%+(jsoo_runtime)"
      -r
      js_of_ocaml-ppx.as-lib)
-    (run tr -d "\r")
+    (run tr -d \r)
     (with-accepted-exit-codes
      (or 0 1)
      (run grep -v ^$))))))