Use Rec_info.unknown instead of unit

Author: lukemaurer

.depend

@@ -6131,6 +6131,7 @@ middle_end/flambda/simplify/simplify.cmo : \
     middle_end/flambda/lifting/reification.cmi \
     middle_end/flambda/basic/reg_width_const.cmi \
     middle_end/flambda/basic/recursive.cmi \
+    middle_end/flambda/compilenv_deps/rec_info.cmi \
     utils/profile.cmi \
     middle_end/flambda/basic/or_variable.cmi \
     middle_end/flambda/types/basic/or_bottom.cmi \
@@ -6203,6 +6204,7 @@ middle_end/flambda/simplify/simplify.cmx : \
     middle_end/flambda/lifting/reification.cmx \
     middle_end/flambda/basic/reg_width_const.cmx \
     middle_end/flambda/basic/recursive.cmx \
+    middle_end/flambda/compilenv_deps/rec_info.cmx \
     utils/profile.cmx \
     middle_end/flambda/basic/or_variable.cmx \
     middle_end/flambda/types/basic/or_bottom.cmx \
@@ -6295,6 +6297,7 @@ middle_end/flambda/simplify/simplify_apply_expr.rec.cmo : \
     middle_end/flambda/simplify/simplify_common.cmi \
     middle_end/flambda/basic/simple.cmi \
     middle_end/flambda/terms/set_of_closures.cmi \
+    middle_end/flambda/compilenv_deps/rec_info.cmi \
     middle_end/flambda/types/basic/or_bottom.cmi \
     middle_end/flambda/naming/name_mode.cmi \
     utils/misc.cmi \
@@ -6327,6 +6330,7 @@ middle_end/flambda/simplify/simplify_apply_expr.rec.cmx : \
     middle_end/flambda/simplify/simplify_common.cmx \
     middle_end/flambda/basic/simple.cmx \
     middle_end/flambda/terms/set_of_closures.cmx \
+    middle_end/flambda/compilenv_deps/rec_info.cmx \
     middle_end/flambda/types/basic/or_bottom.cmx \
     middle_end/flambda/naming/name_mode.cmx \
     utils/misc.cmx \
@@ -6720,6 +6724,7 @@ middle_end/flambda/simplify/simplify_set_of_closures.rec.cmo : \
     middle_end/flambda/basic/simple.cmi \
     middle_end/flambda/terms/set_of_closures.cmi \
     middle_end/flambda/basic/scope.cmi \
+    middle_end/flambda/compilenv_deps/rec_info.cmi \
     utils/profile.cmi \
     middle_end/flambda/naming/name_occurrences.cmi \
     middle_end/flambda/naming/name_mode.cmi \
@@ -6759,6 +6764,7 @@ middle_end/flambda/simplify/simplify_set_of_closures.rec.cmx : \
     middle_end/flambda/basic/simple.cmx \
     middle_end/flambda/terms/set_of_closures.cmx \
     middle_end/flambda/basic/scope.cmx \
+    middle_end/flambda/compilenv_deps/rec_info.cmx \
     utils/profile.cmx \
     middle_end/flambda/naming/name_occurrences.cmx \
     middle_end/flambda/naming/name_mode.cmx \

middle_end/flambda/compilenv_deps/rec_info.ml

@@ -34,4 +34,6 @@ end)
 
 let initial = ()
 
+let unknown = ()
+
 let is_initial () = true

middle_end/flambda/compilenv_deps/rec_info.mli

@@ -13,11 +13,13 @@
 (**************************************************************************)
 
 [@@@ocaml.warning "+a-4-30-40-41-42"]
-type t = unit
+type t
 
 include Identifiable.S with type t := t
 
 val initial : t
 
+val unknown : t
+
 val is_initial : t -> bool
 

middle_end/flambda/inlining/inlining_decision.ml

@@ -218,7 +218,7 @@ end
 (* CR mshinwell: This parameter needs to be configurable *)
 let max_rec_depth = 1
 
-let make_decision_for_call_site denv ~function_decl_rec_info:()
+let make_decision_for_call_site denv ~function_decl_rec_info:_
       ~apply_inlining_state (inline : Inline_attribute.t)
       : Call_site_decision.t =
   if (not (DE.can_inline denv)) then

middle_end/flambda/simplify/simplify_apply_expr.rec.ml

@@ -105,7 +105,7 @@ let simplify_direct_full_application dacc apply function_decl_opt
       let apply_inlining_state = Apply.inlining_state apply in
       let decision =
         Inlining_decision.make_decision_for_call_site (DA.denv dacc)
-          ~function_decl_rec_info:()
+          ~function_decl_rec_info:Rec_info.unknown
           ~apply_inlining_state
           (Apply.inline apply)
       in

middle_end/flambda/simplify/simplify_set_of_closures.rec.ml

@@ -153,7 +153,7 @@ end = struct
                   ~pass:Inlining_report.Before_simplify
                   denv function_decl
                   ~code_id:new_code_id
-                  ())
+                  Rec_info.unknown)
               (Function_declarations.funs function_decls)
           in
           Closure_id.Map.mapi (fun closure_id _function_decl ->
@@ -465,7 +465,7 @@ let simplify_function context ~used_closure_vars ~shareable_constants
       function_decl_type
         ~pass:Inlining_report.After_simplify
         (DA.denv dacc_after_body) function_decl
-        ~params_and_body ()
+        ~params_and_body Rec_info.unknown
     in
     { function_decl;
       new_code_id;

middle_end/flambda/types/structures/function_declaration_type.rec.ml

@@ -52,10 +52,10 @@ module Inlinable = struct
   let is_tupled t = t.is_tupled
 
   let apply_name_permutation
-        ({ code_id; dbg = _; rec_info = (); is_tupled = _; } as t) perm =
+        ({ code_id; dbg = _; rec_info = _; is_tupled = _; } as t) perm =
     let code_id' = Name_permutation.apply_code_id perm code_id in
     if code_id == code_id' then t
-    else { t with code_id = code_id'; }
+    else { t with code_id = code_id'; rec_info = Rec_info.unknown }
 
 end
 
@@ -108,15 +108,15 @@ let print ppf t =
 let free_names (t : t) =
   match t with
   | Bottom | Unknown -> Name_occurrences.empty
-  | Ok (Inlinable { code_id; dbg = _; rec_info = (); is_tupled = _; })
+  | Ok (Inlinable { code_id; dbg = _; rec_info = _; is_tupled = _; })
   | Ok (Non_inlinable { code_id; is_tupled = _; }) ->
     Name_occurrences.add_code_id Name_occurrences.empty code_id
       Name_mode.in_types
 
 let all_ids_for_export (t : t) =
   match t with
   | Bottom | Unknown -> Ids_for_export.empty
-  | Ok (Inlinable { code_id; dbg = _; rec_info = (); is_tupled = _; })
+  | Ok (Inlinable { code_id; dbg = _; rec_info = _; is_tupled = _; })
   | Ok (Non_inlinable { code_id; is_tupled = _; }) ->
     Ids_for_export.add_code_id Ids_for_export.empty code_id
 
@@ -178,13 +178,13 @@ let meet (env : Meet_env.t) (t1 : t) (t2 : t)
   | Ok (Inlinable {
       code_id = code_id1;
       dbg = dbg1;
-      rec_info = ();
+      rec_info = _;
       is_tupled = is_tupled1;
     }),
     Ok (Inlinable {
       code_id = code_id2;
       dbg = dbg2;
-      rec_info = ();
+      rec_info = _;
       is_tupled = is_tupled2;
     }) ->
     let typing_env = Meet_env.env env in
@@ -196,7 +196,7 @@ let meet (env : Meet_env.t) (t1 : t) (t2 : t)
       Ok (Ok (Inlinable {
           code_id;
           dbg = dbg1;
-          rec_info = ();
+          rec_info = Rec_info.unknown;
           is_tupled = is_tupled1;
         }),
         TEE.empty ())
@@ -249,13 +249,13 @@ let join (env : Join_env.t) (t1 : t) (t2 : t) : t =
   | Ok (Inlinable {
       code_id = code_id1;
       dbg = dbg1;
-      rec_info = ();
+      rec_info = _;
       is_tupled = is_tupled1;
     }),
     Ok (Inlinable {
       code_id = code_id2;
       dbg = dbg2;
-      rec_info = ();
+      rec_info = _;
       is_tupled = is_tupled2;
     }) ->
     let typing_env = Join_env.target_join_env env in
@@ -267,7 +267,7 @@ let join (env : Join_env.t) (t1 : t) (t2 : t) : t =
       Ok (Inlinable {
         code_id;
         dbg = dbg1;
-        rec_info = ();
+        rec_info = Rec_info.unknown;
         is_tupled = is_tupled1;
       })
     in