Renamed rec_info to coercion in preparation for the coercion patch (#439)

Author: lukemaurer

middle_end/flambda/basic/simple.ml

@@ -53,21 +53,21 @@ let pattern_match' t ~var ~symbol ~const =
 
 let const_from_descr descr = const (RWC.of_descr descr)
 
-let without_rec_info t = pattern_match t ~name ~const
+let without_coercion t = pattern_match t ~name ~const
 
-let merge_rec_info t ~newer_rec_info =
+let merge_coercion t ~newer_coercion =
   if is_const t then None
   else
-    match newer_rec_info with
+    match newer_coercion with
     | None -> Some t
-    | Some newer_rec_info ->
-      let rec_info =
-        match rec_info t with
-        | None -> newer_rec_info
-        | Some older_rec_info ->
-          Rec_info.merge older_rec_info ~newer:newer_rec_info
+    | Some newer_coercion ->
+      let coercion =
+        match coercion t with
+        | None -> newer_coercion
+        | Some older_coercion ->
+          Rec_info.merge older_coercion ~newer:newer_coercion
       in
-      Some (with_rec_info (without_rec_info t) rec_info)
+      Some (with_coercion (without_coercion t) coercion)
 
 (* CR mshinwell: Make naming consistent with [Name] re. the option type *)
 
@@ -86,7 +86,7 @@ let [@inline always] must_be_name t =
 let to_name t =
   match must_be_name t with
   | None -> None
-  | Some name -> Some (rec_info t, name)
+  | Some name -> Some (coercion t, name)
 
 let map_name t ~f =
   match must_be_name t with

middle_end/flambda/basic/simple.mli

@@ -23,11 +23,11 @@ include module type of struct include Reg_width_things.Simple end
 
 include Contains_names.S with type t := t
 
-val has_rec_info : t -> bool
+val has_coercion : t -> bool
 
-val merge_rec_info : t -> newer_rec_info:Rec_info.t option -> t option
+val merge_coercion : t -> newer_coercion:Rec_info.t option -> t option
 
-val without_rec_info : t -> t
+val without_coercion : t -> t
 
 val must_be_var : t -> Variable.t option
 

middle_end/flambda/cmx/ids_for_export.ml

@@ -75,7 +75,7 @@ let add_name t name =
 
 let add_simple t simple =
   let simples =
-    match Simple.rec_info simple with
+    match Simple.coercion simple with
     | None -> t.simples
     | Some _ -> Simple.Set.add simple t.simples
   in
@@ -93,7 +93,7 @@ let add_continuation t continuation =
 
 let from_simple simple =
   let simples =
-    match Simple.rec_info simple with
+    match Simple.coercion simple with
     | None ->
       (* This simple will not be in the grand_table_of_simples *)
       Simple.Set.empty

middle_end/flambda/compilenv_deps/reg_width_things.ml

@@ -225,27 +225,27 @@ end
 module Simple_data = struct
   type t = {
     simple : Id.t;  (* always without [Rec_info] *)
-    rec_info : Rec_info.t;
+    coercion : Rec_info.t;
   }
 
   let flags = simple_flags
 
-  let print ppf { simple = _; rec_info; } =
+  let print ppf { simple = _; coercion; } =
     Format.fprintf ppf "@[<hov 1>\
-        @[<hov 1>(rec_info@ %a)@]\
+        @[<hov 1>(coercion@ %a)@]\
         @]"
-      Rec_info.print rec_info
+      Rec_info.print coercion
 
-  let hash { simple; rec_info; } =
-    Hashtbl.hash (Id.hash simple, Rec_info.hash rec_info)
+  let hash { simple; coercion; } =
+    Hashtbl.hash (Id.hash simple, Rec_info.hash coercion)
 
   let equal t1 t2 =
     if t1 == t2 then true
     else
-      let { simple = simple1; rec_info = rec_info1; } = t1 in
-      let { simple = simple2; rec_info = rec_info2; } = t2 in
+      let { simple = simple1; coercion = coercion1; } = t1 in
+      let { simple = simple2; coercion = coercion2; } = t2 in
       Id.equal simple1 simple2
-        && Rec_info.equal rec_info1 rec_info2
+        && Rec_info.equal coercion1 coercion2
 end
 
 module Const = struct
@@ -519,7 +519,7 @@ module Simple = struct
 
   let find_data t = Table.find !grand_table_of_simples t
 
-  let has_rec_info t =
+  let has_coercion t =
     Id.flags t = simple_flags
 
   let name n = n
@@ -553,9 +553,9 @@ module Simple = struct
     in
     pattern_match t1 ~name ~const
 
-  let [@inline always] rec_info t =
+  let [@inline always] coercion t =
     let flags = Id.flags t in
-    if flags = simple_flags then Some ((find_data t).rec_info)
+    if flags = simple_flags then Some ((find_data t).coercion)
     else None
 
   module T0 = struct
@@ -569,15 +569,15 @@ module Simple = struct
           ~name:(fun name -> Name.print ppf name)
           ~const:(fun cst -> Const.print ppf cst)
       in
-      match rec_info t with
+      match coercion t with
       | None -> print ppf t
-      | Some rec_info ->
+      | Some coercion ->
        Format.fprintf ppf "@[<hov 1>\
             @[<hov 1>(simple@ %a)@] \
-            @[<hov 1>(rec_info@ %a)@]\
+            @[<hov 1>(coercion@ %a)@]\
             @]"
           print t
-          Rec_info.print rec_info
+          Rec_info.print coercion
 
     let output chan t =
       print (Format.formatter_of_out_channel chan) t
@@ -589,12 +589,12 @@ module Simple = struct
     include T0
   end
 
-  let with_rec_info t new_rec_info =
-    if Rec_info.is_initial new_rec_info then t
+  let with_coercion t new_coercion =
+    if Rec_info.is_initial new_coercion then t
     else
-      match rec_info t with
+      match coercion t with
       | None ->
-        let data : Simple_data.t = { simple = t; rec_info = new_rec_info; } in
+        let data : Simple_data.t = { simple = t; coercion = new_coercion; } in
         Table.add !grand_table_of_simples data
       | Some _ ->
         Misc.fatal_errorf "Cannot add [Rec_info] to [Simple] %a that already \

middle_end/flambda/compilenv_deps/reg_width_things.mli

@@ -154,12 +154,12 @@ module Simple : sig
 
   val const : Const.t -> t
 
-  val rec_info : t -> Rec_info.t option
+  val coercion : t -> Rec_info.t option
 
-  val with_rec_info : t -> Rec_info.t -> t
+  val with_coercion : t -> Rec_info.t -> t
 
   (* This does not consult the grand table of [Simple]s. *)
-  val has_rec_info : t -> bool
+  val has_coercion : t -> bool
 
   val pattern_match
      : t
@@ -168,7 +168,7 @@ module Simple : sig
     -> 'a
 
   (* [same s1 s2] returns true iff they represent the same name or const
-     i.e. [same s (with_rec_info s rec_info)] returns true *)
+     i.e. [same s (with_coercion s coercion)] returns true *)
   val same : t -> t -> bool
 
   val export : t -> exported

middle_end/flambda/inlining/inlining_state.ml

@@ -21,7 +21,7 @@ type t = {
   depth: int
 }
 
-let increment_depth t = { t with depth = t.depth + 1 } 
+let increment_depth t = { t with depth = t.depth + 1 }
 
 let default = {
     arguments = Inlining_arguments.unknown;

middle_end/flambda/inlining/inlining_transforms.ml

@@ -40,8 +40,8 @@ let make_inlined_body ~callee ~unroll_to ~params ~args ~my_closure ~body
       apply_exn_continuation
   in
   let callee =
-    Simple.merge_rec_info callee
-      ~newer_rec_info:(Some (Rec_info.create ~depth:1 ~unroll_to))
+    Simple.merge_coercion callee
+      ~newer_coercion:(Some (Rec_info.create ~depth:1 ~unroll_to))
     |> Option.get  (* CR mshinwell: improve *)
   in
   Expr.apply_renaming

middle_end/flambda/naming/renaming.ml

@@ -330,15 +330,15 @@ let apply_simple t simple =
     let new_name = apply_name t old_name in
     if old_name == new_name then simple
     else
-      match Simple.rec_info simple with
+      match Simple.coercion simple with
       | None -> Simple.name new_name
-      | Some rec_info -> Simple.with_rec_info (Simple.name new_name) rec_info
+      | Some coercion -> Simple.with_coercion (Simple.name new_name) coercion
   in
   (* Constants are never permuted, only freshened upon import. *)
   Simple.pattern_match simple
     ~name
     ~const:(fun cst ->
-      assert (not (Simple.has_rec_info simple));
+      assert (not (Simple.has_coercion simple));
       Simple.const (apply_const t cst))
 
 let closure_var_is_used t closure_var =

middle_end/flambda/simplify/simplify_apply_expr.ml

@@ -643,11 +643,11 @@ let simplify_function_call ~simplify_expr dacc apply ~callee_ty
       in
       (* CR mshinwell: This should go in Typing_env (ditto logic for Rec_info
          in Simplify_simple *)
-      let function_decl_rec_info =
-        let rec_info = I.rec_info inlinable in
-        match Simple.rec_info (Apply.callee apply) with
-        | None -> rec_info
-        | Some newer -> Rec_info.merge rec_info ~newer
+      let function_decl_coercion =
+        let coercion = I.rec_info inlinable in
+        match Simple.coercion (Apply.callee apply) with
+        | None -> coercion
+        | Some newer -> Rec_info.merge coercion ~newer
       in
       let callee's_code_id_from_type = I.code_id inlinable in
       let callee's_code = DE.find_code denv callee's_code_id_from_type in
@@ -658,7 +658,7 @@ let simplify_function_call ~simplify_expr dacc apply ~callee_ty
         ~result_arity:(Code.result_arity callee's_code)
         ~recursive:(Code.recursive callee's_code)
         ~must_be_detupled
-        (Some (inlinable, function_decl_rec_info))
+        (Some (inlinable, function_decl_coercion))
         ~down_to_up
     | Ok (Non_inlinable non_inlinable) ->
       let module N = T.Function_declaration_type.Non_inlinable in

middle_end/flambda/simplify/simplify_unary_primitive.ml

@@ -38,12 +38,12 @@ module Int64 = Numbers.Int64
             {(thd3/0
               (Ok (Inlinable (code_id thd3_0_tuple_stub/2) (param_arity 𝕍)
                    (result_arity 𝕍) (stub true) (dbg ) (inline Default_inline)
-                   (is_a_functor false) (recursive Non_recursive) (rec_info ((depth 1) (unroll_to None))))))
+                   (is_a_functor false) (recursive Non_recursive) (coercion ((depth 1) (unroll_to None))))))
              (thd3/1
               (Ok (Inlinable (code_id thd3_0/3) (param_arity 𝕍 ⨯ 𝕍 ⨯ 𝕍)
                    (result_arity 𝕍) (stub false) (dbg tuple_stub.ml:1,9--20)
                    (inline Default_inline) (is_a_functor false) (recursive Non_recursive)
-                   (rec_info ((depth 1) (unroll_to None))))))})
+                   (coercion ((depth 1) (unroll_to None))))))})
            (closure_types ((components_by_index {(thd3/0 (Val (= Tuple_stub.camlTuple_stub__thd3_2))) (thd3/1 (Val (= Tuple_stub.camlTuple_stub__thd3_3)))})))
            (closure_var_types ((components_by_index {})))))}) (other_tags Bottom)))
     unboxed_version/48 : (Val (= Tuple_stub.camlTuple_stub__thd3_3)))))