int32 as 64 for closures

TheNumbat · TheNumbat · commit 6d005f47a25c · 2024-05-02T16:57:34.000-04:00
diff --git a/middle_end/flambda2/to_cmm/to_cmm_set_of_closures.ml b/middle_end/flambda2/to_cmm/to_cmm_set_of_closures.ml
@@ -171,8 +171,10 @@ end = struct
               | Naked_number Naked_immediate -> Immediate
               | Naked_number Naked_float32 -> Naked_float32
               | Naked_number Naked_float -> Naked_float
-              | Naked_number Naked_int32 -> Naked_int32
-              | Naked_number Naked_int64 | Naked_number Naked_nativeint ->
+              (* Int32s are not tightly packed and are loaded via Word_int. *)
+              | Naked_number Naked_int32
+              | Naked_number Naked_int64
+              | Naked_number Naked_nativeint ->
                 Naked_int64
               | Naked_number Naked_vec128 -> Naked_vec128
               | Region | Rec_info ->
diff --git a/middle_end/flambda2/to_cmm/to_cmm_shared.ml b/middle_end/flambda2/to_cmm/to_cmm_shared.ml
@@ -262,8 +262,8 @@ module Update_kind = struct
   type t =
     | Value
     | Immediate
-    | Naked_int64
     | Naked_int32
+    | Naked_int64
     | Naked_float
     | Naked_float32
     | Naked_vec128
diff --git a/middle_end/flambda2/to_cmm/to_cmm_shared.mli b/middle_end/flambda2/to_cmm/to_cmm_shared.mli
@@ -90,8 +90,8 @@ module Update_kind : sig
   type t =
     | Value
     | Immediate
-    | Naked_int64
     | Naked_int32
+    | Naked_int64
     | Naked_float
     | Naked_float32
     | Naked_vec128
