WIP

Author: vouillon

compiler/lib-wasm/generate.ml

@@ -102,10 +102,10 @@ module Generate (Target : Target_sig.S) = struct
     match from, into with
     | Number (Int Unnormalized), Number (Int Normalized) ->
         Arith.((e lsl const 1l) asr const 1l)
-    | (Number (Int Ref) | Top | Bot), Number (Int (Normalized | Unnormalized)) ->
-        Value.int_val e
-    | Number (Int (Unnormalized | Normalized)), (Number (Int Ref) | Top) ->
-        Value.val_int e
+    | Number (Int (Normalized | Unnormalized)), Number (Int (Normalized | Unnormalized))
+      -> e
+    | _, Number (Int (Normalized | Unnormalized)) -> Value.int_val e
+    | Number (Int (Unnormalized | Normalized)), _ -> Value.val_int e
     | _ -> e
 
   let specialized_primitives =
@@ -830,10 +830,11 @@ module Generate (Target : Target_sig.S) = struct
           ~tag
           ~load:(fun x -> convert ~from:(get_var_type ctx x) ~into:Top (load x))
           (List.map ~f:(fun x -> `Var x) (Array.to_list a))
-    | Field (x, n, Non_float) -> Memory.field (load x) n
+    | Field (x, n, Non_float) ->
+        Memory.field (convert ~from:(get_var_type ctx x) ~into:Top (load x)) n
     | Field (x, n, Float) ->
         Memory.float_array_get
-          (load x)
+          (convert ~from:(get_var_type ctx x) ~into:Top (load x))
           (Constant.translate (Int (Targetint.of_int_warning_on_overflow n)))
     | Closure _ ->
         Closure.translate
@@ -977,12 +978,12 @@ module Generate (Target : Target_sig.S) = struct
             (translate_expr ctx context x e)
     | Set_field (x, n, Non_float, y) ->
         Memory.set_field
-          (load x)
+          (convert ~from:(get_var_type ctx x) ~into:Top (load x))
           n
           (convert ~from:(get_var_type ctx y) ~into:Top (load y))
     | Set_field (x, n, Float, y) ->
         Memory.float_array_set
-          (load x)
+          (convert ~from:(get_var_type ctx x) ~into:Top (load x))
           (Constant.translate (Int (Targetint.of_int_warning_on_overflow n)))
           (load y)
     | Offset_ref (x, n) ->