completely remove typ_int64 from cmm

Author: alanechang

backend/cmm_helpers.ml

@@ -1140,8 +1140,6 @@ module Extended_machtype = struct
 
   let typ_any_int = [| Extended_machtype_component.Any_int |]
 
-  let typ_int64 = [| Extended_machtype_component.Any_int |]
-
   let typ_float = [| Extended_machtype_component.Float |]
 
   let typ_vec128 = [| Extended_machtype_component.Vec128 |]
@@ -3906,12 +3904,6 @@ let emit_preallocated_blocks preallocated_blocks cont =
 
 (* Helper functions and values used by Flambda 2. *)
 
-let typ_int64 =
-  match Arch.size_int with
-  | 4 -> [| Cmm.Int; Cmm.Int |]
-  | 8 -> [| Cmm.Int |]
-  | _ -> Misc.fatal_errorf "Unsupported Arch.size_int = %d" Arch.size_int
-
 let void = Ctuple []
 
 let unit ~dbg = Cconst_int (1, dbg)

backend/cmm_helpers.mli

@@ -395,8 +395,6 @@ module Extended_machtype : sig
 
   val typ_any_int : t
 
-  val typ_int64 : t
-
   val typ_float : t
 
   val typ_void : t
@@ -970,9 +968,6 @@ val emit_preallocated_blocks :
 
 (** {1} Helper functions and values used by Flambda 2. *)
 
-(** An adequate Cmm machtype for an int64 (including on a 32-bit target). *)
-val typ_int64 : Cmm.machtype
-
 (* CR mshinwell: [dbg] should not be optional. *)
 
 (** The void (i.e. empty tuple) cmm value. Not to be confused with [() : unit]. *)

middle_end/flambda2/to_cmm/to_cmm_shared.ml

@@ -50,9 +50,9 @@ let machtype_of_kind (kind : Flambda_kind.With_subkind.t) =
     | Value_array | Generic_array ->
       Cmm.typ_val)
   | Naked_number Naked_float -> Cmm.typ_float
-  | Naked_number Naked_int64 -> typ_int64
   | Naked_number Naked_vec128 -> Cmm.typ_vec128
-  | Naked_number (Naked_immediate | Naked_int32 | Naked_nativeint) ->
+  | Naked_number (Naked_immediate | Naked_int32 | Naked_int64 | Naked_nativeint)
+    ->
     Cmm.typ_int
   | Region | Rec_info -> assert false
 
@@ -66,9 +66,9 @@ let extended_machtype_of_kind (kind : Flambda_kind.With_subkind.t) =
     | Value_array | Generic_array ->
       Extended_machtype.typ_val)
   | Naked_number Naked_float -> Extended_machtype.typ_float
-  | Naked_number Naked_int64 -> Extended_machtype.typ_int64
   | Naked_number Naked_vec128 -> Extended_machtype.typ_vec128
-  | Naked_number (Naked_immediate | Naked_int32 | Naked_nativeint) ->
+  | Naked_number (Naked_immediate | Naked_int32 | Naked_int64 | Naked_nativeint)
+    ->
     Extended_machtype.typ_any_int
   | Region | Rec_info -> assert false
 

ocaml/asmcomp/cmm_helpers.ml

@@ -910,8 +910,6 @@ module Extended_machtype = struct
 
   let typ_any_int = [| Extended_machtype_component.Any_int |]
 
-  let typ_int64 = [| Extended_machtype_component.Any_int |]
-
   let typ_float = [| Extended_machtype_component.Float |]
 
   let typ_void = [||]

ocaml/asmcomp/cmm_helpers.mli

@@ -311,8 +311,6 @@ module Extended_machtype : sig
 
   val typ_any_int : t
 
-  val typ_int64 : t
-
   val typ_float : t
 
   val typ_void : t