Static_const_with_free_names -> Rebuilt_static_const (ocaml#351)

Author: mshinwell

.depend

@@ -5307,7 +5307,7 @@ middle_end/flambda/lifting/lifted_constant.cmo : \
     lambda/tag.cmi \
     middle_end/flambda/terms/symbol_projection.cmi \
     middle_end/flambda/compilenv_deps/symbol.cmi \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi \
     middle_end/flambda/basic/simple.cmi \
     middle_end/flambda/terms/set_of_closures.cmi \
     middle_end/flambda/naming/name_occurrences.cmi \
@@ -5330,7 +5330,7 @@ middle_end/flambda/lifting/lifted_constant.cmx : \
     lambda/tag.cmx \
     middle_end/flambda/terms/symbol_projection.cmx \
     middle_end/flambda/compilenv_deps/symbol.cmx \
-    middle_end/flambda/simplify/static_const_with_free_names.cmx \
+    middle_end/flambda/simplify/rebuilt_static_const.cmx \
     middle_end/flambda/basic/simple.cmx \
     middle_end/flambda/terms/set_of_closures.cmx \
     middle_end/flambda/naming/name_occurrences.cmx \
@@ -5349,7 +5349,7 @@ middle_end/flambda/lifting/lifted_constant.cmi : \
     middle_end/flambda/compilenv_deps/variable.cmi \
     middle_end/flambda/terms/symbol_projection.cmi \
     middle_end/flambda/compilenv_deps/symbol.cmi \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi \
     middle_end/flambda/basic/simple.cmi \
     middle_end/flambda/naming/name_occurrences.cmi \
     middle_end/flambda/types/flambda_type.cmi \
@@ -5359,7 +5359,7 @@ middle_end/flambda/lifting/lifted_constant.cmi : \
     middle_end/flambda/terms/bound_symbols.cmi
 middle_end/flambda/lifting/lifted_constant_state.cmo : \
     middle_end/flambda/compilenv_deps/symbol.cmi \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi \
     middle_end/flambda/basic/name.cmi \
     middle_end/flambda/lifting/lifted_constant.cmi \
     middle_end/flambda/types/flambda_type.cmi \
@@ -5369,7 +5369,7 @@ middle_end/flambda/lifting/lifted_constant_state.cmo : \
     middle_end/flambda/lifting/lifted_constant_state.cmi
 middle_end/flambda/lifting/lifted_constant_state.cmx : \
     middle_end/flambda/compilenv_deps/symbol.cmx \
-    middle_end/flambda/simplify/static_const_with_free_names.cmx \
+    middle_end/flambda/simplify/rebuilt_static_const.cmx \
     middle_end/flambda/basic/name.cmx \
     middle_end/flambda/lifting/lifted_constant.cmx \
     middle_end/flambda/types/flambda_type.cmx \
@@ -5385,7 +5385,7 @@ middle_end/flambda/lifting/reification.cmo : \
     middle_end/flambda/compilenv_deps/variable.cmi \
     middle_end/flambda/naming/var_in_binding_pos.cmi \
     middle_end/flambda/compilenv_deps/symbol.cmi \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi \
     middle_end/flambda/simplify/simplify_import.cmi \
     middle_end/flambda/simplify/basic/simplified_named.cmi \
     middle_end/flambda/basic/simple.cmi \
@@ -5401,7 +5401,7 @@ middle_end/flambda/lifting/reification.cmx : \
     middle_end/flambda/compilenv_deps/variable.cmx \
     middle_end/flambda/naming/var_in_binding_pos.cmx \
     middle_end/flambda/compilenv_deps/symbol.cmx \
-    middle_end/flambda/simplify/static_const_with_free_names.cmx \
+    middle_end/flambda/simplify/rebuilt_static_const.cmx \
     middle_end/flambda/simplify/simplify_import.cmx \
     middle_end/flambda/simplify/basic/simplified_named.cmx \
     middle_end/flambda/basic/simple.cmx \
@@ -6044,7 +6044,7 @@ middle_end/flambda/simplify/expr_builder.cmo : \
     middle_end/flambda/basic/symbol_scoping_rule.cmi \
     middle_end/flambda/terms/symbol_projection.cmi \
     lambda/switch.cmi \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi \
     middle_end/flambda/simplify/basic/simplified_named.cmi \
     middle_end/flambda/basic/simple.cmi \
     middle_end/flambda/terms/set_of_closures.cmi \
@@ -6074,7 +6074,7 @@ middle_end/flambda/simplify/expr_builder.cmx : \
     middle_end/flambda/basic/symbol_scoping_rule.cmx \
     middle_end/flambda/terms/symbol_projection.cmx \
     lambda/switch.cmx \
-    middle_end/flambda/simplify/static_const_with_free_names.cmx \
+    middle_end/flambda/simplify/rebuilt_static_const.cmx \
     middle_end/flambda/simplify/basic/simplified_named.cmx \
     middle_end/flambda/basic/simple.cmx \
     middle_end/flambda/terms/set_of_closures.cmx \
@@ -6186,7 +6186,7 @@ middle_end/flambda/simplify/simplify_apply_expr.cmo : \
     middle_end/flambda/compilenv_deps/variable.cmi \
     middle_end/flambda/basic/var_within_closure.cmi \
     middle_end/flambda/naming/var_in_binding_pos.cmi \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi \
     middle_end/flambda/simplify/simplify_import.cmi \
     middle_end/flambda/simplify/simplify_common.cmi \
     middle_end/flambda/basic/simple.cmi \
@@ -6219,7 +6219,7 @@ middle_end/flambda/simplify/simplify_apply_expr.cmx : \
     middle_end/flambda/compilenv_deps/variable.cmx \
     middle_end/flambda/basic/var_within_closure.cmx \
     middle_end/flambda/naming/var_in_binding_pos.cmx \
-    middle_end/flambda/simplify/static_const_with_free_names.cmx \
+    middle_end/flambda/simplify/rebuilt_static_const.cmx \
     middle_end/flambda/simplify/simplify_import.cmx \
     middle_end/flambda/simplify/simplify_common.cmx \
     middle_end/flambda/basic/simple.cmx \
@@ -6516,7 +6516,7 @@ middle_end/flambda/simplify/simplify_named.cmo : \
     middle_end/flambda/compilenv_deps/target_imm.cmi \
     middle_end/flambda/terms/symbol_projection.cmi \
     middle_end/flambda/compilenv_deps/symbol.cmi \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi \
     middle_end/flambda/simplify/simplify_static_const.cmi \
     middle_end/flambda/simplify/simplify_set_of_closures.cmi \
     middle_end/flambda/simplify/simplify_primitive.cmi \
@@ -6541,7 +6541,7 @@ middle_end/flambda/simplify/simplify_named.cmx : \
     middle_end/flambda/compilenv_deps/target_imm.cmx \
     middle_end/flambda/terms/symbol_projection.cmx \
     middle_end/flambda/compilenv_deps/symbol.cmx \
-    middle_end/flambda/simplify/static_const_with_free_names.cmx \
+    middle_end/flambda/simplify/rebuilt_static_const.cmx \
     middle_end/flambda/simplify/simplify_static_const.cmx \
     middle_end/flambda/simplify/simplify_set_of_closures.cmx \
     middle_end/flambda/simplify/simplify_primitive.cmx \
@@ -6632,7 +6632,7 @@ middle_end/flambda/simplify/simplify_set_of_closures.cmo : \
     middle_end/flambda/naming/var_in_binding_pos.cmi \
     middle_end/flambda/terms/symbol_projection.cmi \
     middle_end/flambda/compilenv_deps/symbol.cmi \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi \
     middle_end/flambda/simplify/basic/simplify_named_result.cmi \
     middle_end/flambda/simplify/simplify_import.cmi \
     middle_end/flambda/simplify/simplify_common.cmi \
@@ -6673,7 +6673,7 @@ middle_end/flambda/simplify/simplify_set_of_closures.cmx : \
     middle_end/flambda/naming/var_in_binding_pos.cmx \
     middle_end/flambda/terms/symbol_projection.cmx \
     middle_end/flambda/compilenv_deps/symbol.cmx \
-    middle_end/flambda/simplify/static_const_with_free_names.cmx \
+    middle_end/flambda/simplify/rebuilt_static_const.cmx \
     middle_end/flambda/simplify/basic/simplify_named_result.cmx \
     middle_end/flambda/simplify/simplify_import.cmx \
     middle_end/flambda/simplify/simplify_common.cmx \
@@ -6710,7 +6710,7 @@ middle_end/flambda/simplify/simplify_set_of_closures.cmx : \
     middle_end/flambda/simplify/simplify_set_of_closures.cmi
 middle_end/flambda/simplify/simplify_set_of_closures.cmi : \
     middle_end/flambda/compilenv_deps/symbol.cmi \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi \
     middle_end/flambda/simplify/basic/simplify_named_result.cmi \
     middle_end/flambda/simplify/simplify_import.cmi \
     middle_end/flambda/simplify/simplify_common.cmi \
@@ -6744,7 +6744,7 @@ middle_end/flambda/simplify/simplify_simple.cmi : \
     middle_end/flambda/simplify/env/downwards_acc.cmi
 middle_end/flambda/simplify/simplify_static_const.cmo : \
     lambda/tag.cmi \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi \
     middle_end/flambda/simplify/simplify_set_of_closures.cmi \
     middle_end/flambda/simplify/simplify_import.cmi \
     middle_end/flambda/basic/simple.cmi \
@@ -6759,7 +6759,7 @@ middle_end/flambda/simplify/simplify_static_const.cmo : \
     middle_end/flambda/simplify/simplify_static_const.cmi
 middle_end/flambda/simplify/simplify_static_const.cmx : \
     lambda/tag.cmx \
-    middle_end/flambda/simplify/static_const_with_free_names.cmx \
+    middle_end/flambda/simplify/rebuilt_static_const.cmx \
     middle_end/flambda/simplify/simplify_set_of_closures.cmx \
     middle_end/flambda/simplify/simplify_import.cmx \
     middle_end/flambda/basic/simple.cmx \
@@ -6773,7 +6773,7 @@ middle_end/flambda/simplify/simplify_static_const.cmx : \
     middle_end/flambda/terms/bound_symbols.cmx \
     middle_end/flambda/simplify/simplify_static_const.cmi
 middle_end/flambda/simplify/simplify_static_const.cmi : \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi \
     middle_end/flambda/simplify/simplify_common.cmi \
     middle_end/flambda/terms/flambda.cmi \
     middle_end/flambda/simplify/env/downwards_acc.cmi \
@@ -6905,21 +6905,21 @@ middle_end/flambda/simplify/simplify_variadic_primitive.cmi : \
     middle_end/flambda/terms/flambda_primitive.cmi \
     middle_end/flambda/simplify/env/downwards_acc.cmi \
     lambda/debuginfo.cmi
-middle_end/flambda/simplify/static_const_with_free_names.cmo : \
+middle_end/flambda/simplify/rebuilt_static_const.cmo : \
     middle_end/flambda/types/basic/or_unknown.cmi \
     middle_end/flambda/naming/name_occurrences.cmi \
     utils/misc.cmi \
     middle_end/flambda/terms/flambda.cmi \
     middle_end/flambda/basic/code_id.cmi \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi
-middle_end/flambda/simplify/static_const_with_free_names.cmx : \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi
+middle_end/flambda/simplify/rebuilt_static_const.cmx : \
     middle_end/flambda/types/basic/or_unknown.cmx \
     middle_end/flambda/naming/name_occurrences.cmx \
     utils/misc.cmx \
     middle_end/flambda/terms/flambda.cmx \
     middle_end/flambda/basic/code_id.cmx \
-    middle_end/flambda/simplify/static_const_with_free_names.cmi
-middle_end/flambda/simplify/static_const_with_free_names.cmi : \
+    middle_end/flambda/simplify/rebuilt_static_const.cmi
+middle_end/flambda/simplify/rebuilt_static_const.cmi : \
     middle_end/flambda/compilenv_deps/symbol.cmi \
     middle_end/flambda/terms/set_of_closures.cmi \
     middle_end/flambda/types/basic/or_unknown.cmi \

compilerlibs/Makefile.compilerlibs

@@ -302,7 +302,7 @@ MIDDLE_END_FLAMBDA_SIMPLIFY=\
   middle_end/flambda/simplify/env/continuation_env_and_param_types.cmo \
   middle_end/flambda/simplify/basic/continuation_in_env.cmo \
   middle_end/flambda/simplify/basic/simplified_named.cmo \
-  middle_end/flambda/simplify/static_const_with_free_names.cmo \
+  middle_end/flambda/simplify/rebuilt_static_const.cmo \
   middle_end/flambda/simplify/common_subexpression_elimination.cmo \
   middle_end/flambda/simplify/env/downwards_env.cmo \
   middle_end/flambda/simplify/env/upwards_env.cmo \

middle_end/flambda/lifting/lifted_constant.ml

@@ -36,7 +36,7 @@ module Definition = struct
 
   type t = {
     descr : descr;
-    defining_expr : Static_const_with_free_names.t;
+    defining_expr : Rebuilt_static_const.t;
   }
 
   let binds_symbol t sym =
@@ -49,7 +49,7 @@ module Definition = struct
 
   let free_names t =
     match t.descr with
-    | Code _ -> Static_const_with_free_names.free_names t.defining_expr
+    | Code _ -> Rebuilt_static_const.free_names t.defining_expr
     | Set_of_closures { symbol_projections; _ }
     | Block_like { symbol_projections; _ } ->
       (* The symbols mentioned in any symbol projections must be counted
@@ -59,7 +59,7 @@ module Definition = struct
           Name_occurrences.add_symbol free_names
             (Symbol_projection.symbol proj) Name_mode.normal)
         symbol_projections
-        (Static_const_with_free_names.free_names t.defining_expr)
+        (Rebuilt_static_const.free_names t.defining_expr)
 
   let print_descr ppf descr =
     match descr with
@@ -80,7 +80,7 @@ module Definition = struct
         @[<hov 1>(defining_expr@ %a)@]\
         @]"
       print_descr descr
-      Static_const_with_free_names.print defining_expr
+      Rebuilt_static_const.print defining_expr
 
   let descr t = t.descr
   let defining_expr t = t.defining_expr
@@ -92,7 +92,7 @@ module Definition = struct
     | Block_like { symbol_projections; _ } -> symbol_projections
 
   let code code_id defining_expr =
-    match Static_const_with_free_names.const defining_expr with
+    match Rebuilt_static_const.const defining_expr with
     | Code code ->
       if Code_id.equal code_id (Code.code_id code) then
         { descr = Code code_id;
@@ -104,7 +104,7 @@ module Definition = struct
           Code_id.print (Code.code_id code)
     | _ ->
       Misc.fatal_errorf "Not a code definition: %a"
-        Static_const_with_free_names.print defining_expr
+        Rebuilt_static_const.print defining_expr
 
   let set_of_closures denv ~closure_symbols_with_types
         ~symbol_projections defining_expr =
@@ -157,7 +157,7 @@ end
 type t = {
   definitions : Definition.t list;
   bound_symbols : Bound_symbols.t;
-  defining_exprs : Static_const_with_free_names.Group.t;
+  defining_exprs : Rebuilt_static_const.Group.t;
   symbol_projections : Symbol_projection.t Variable.Map.t;
   is_fully_static : bool;
 }
@@ -166,7 +166,7 @@ let definitions t = t.definitions
 let symbol_projections t = t.symbol_projections
 
 let free_names_of_defining_exprs t =
-  Static_const_with_free_names.Group.free_names t.defining_exprs
+  Rebuilt_static_const.Group.free_names t.defining_exprs
 
 let is_fully_static t = t.is_fully_static
 
@@ -183,7 +183,7 @@ let compute_bound_symbols definitions =
 
 let compute_defining_exprs definitions =
   ListLabels.map definitions ~f:Definition.defining_expr
-  |> Static_const_with_free_names.Group.create
+  |> Rebuilt_static_const.Group.create
 
 let create_block_like symbol ~symbol_projections defining_expr denv ty =
   (* CR mshinwell: check that [defining_expr] is not a set of closures
@@ -196,7 +196,7 @@ let create_block_like symbol ~symbol_projections defining_expr denv ty =
     bound_symbols = compute_bound_symbols definitions;
     defining_exprs = compute_defining_exprs definitions;
     is_fully_static =
-      Static_const_with_free_names.is_fully_static defining_expr;
+      Rebuilt_static_const.is_fully_static defining_expr;
     symbol_projections = Definition.symbol_projections definition;
   }
 
@@ -211,7 +211,7 @@ let create_set_of_closures denv ~closure_symbols_with_types
     bound_symbols = compute_bound_symbols definitions;
     defining_exprs = compute_defining_exprs definitions;
     is_fully_static =
-      Static_const_with_free_names.is_fully_static defining_expr;
+      Rebuilt_static_const.is_fully_static defining_expr;
     symbol_projections = Definition.symbol_projections definition;
   }
 
@@ -222,7 +222,7 @@ let create_code code_id defining_expr =
     bound_symbols = compute_bound_symbols definitions;
     defining_exprs = compute_defining_exprs definitions;
     is_fully_static =
-      Static_const_with_free_names.is_fully_static defining_expr;
+      Rebuilt_static_const.is_fully_static defining_expr;
     symbol_projections = Definition.symbol_projections definition;
   }
 
@@ -241,9 +241,9 @@ let concat ts =
   in
   let defining_exprs =
     List.fold_left (fun defining_exprs t ->
-        Static_const_with_free_names.Group.concat t.defining_exprs
+        Rebuilt_static_const.Group.concat t.defining_exprs
           defining_exprs)
-      Static_const_with_free_names.Group.empty
+      Rebuilt_static_const.Group.empty
       ts
   in
   let is_fully_static =
@@ -267,7 +267,7 @@ let concat ts =
   }
 
 let defining_exprs t =
-  Static_const_with_free_names.Group.create
+  Rebuilt_static_const.Group.create
     (List.map Definition.defining_expr t.definitions)
 
 let bound_symbols t =
@@ -298,19 +298,19 @@ let apply_projection t proj =
     let simple =
       match
         Symbol_projection.projection proj,
-        Static_const_with_free_names.const defining_expr
+        Rebuilt_static_const.const defining_expr
       with
       | Block_load { index; }, Block (tag, mut, fields) ->
         if not (Tag.Scannable.equal tag Tag.Scannable.zero) then begin
           Misc.fatal_errorf "Symbol projection@ %a@ on block which doesn't \
               have tag zero:@ %a"
             Symbol_projection.print proj
-            Static_const_with_free_names.print defining_expr
+            Rebuilt_static_const.print defining_expr
         end;
         if Mutability.is_mutable mut then begin
           Misc.fatal_errorf "Symbol projection@ %a@ on mutable block:@ %a"
             Symbol_projection.print proj
-            Static_const_with_free_names.print defining_expr
+            Rebuilt_static_const.print defining_expr
         end;
         let index = Targetint.OCaml.to_int_exn index in
         begin match List.nth_opt fields index with
@@ -325,7 +325,7 @@ let apply_projection t proj =
           Misc.fatal_errorf "Symbol projection@ %a@ has out-of-range \
               index:@ %a"
             Symbol_projection.print proj
-            Static_const_with_free_names.print defining_expr
+            Rebuilt_static_const.print defining_expr
         end;
       | Project_var { project_from; var; }, Set_of_closures set ->
         let decls = Set_of_closures.function_decls set in
@@ -334,15 +334,15 @@ let apply_projection t proj =
           Misc.fatal_errorf "Symbol projection@ %a@ has closure ID not \
               bound by this set of closures:@ %a"
             Symbol_projection.print proj
-            Static_const_with_free_names.print defining_expr
+            Rebuilt_static_const.print defining_expr
         end;
         let closure_env = Set_of_closures.closure_elements set in
         begin match Var_within_closure.Map.find var closure_env with
         | exception Not_found ->
           Misc.fatal_errorf "Symbol projection@ %a@ has closure var not \
               defined in the environment of this set of closures:@ %a"
             Symbol_projection.print proj
-            Static_const_with_free_names.print defining_expr
+            Rebuilt_static_const.print defining_expr
         | closure_entry -> closure_entry
         end
       | Block_load _,
@@ -355,7 +355,7 @@ let apply_projection t proj =
         | Immutable_float_array _ | Mutable_string _ | Immutable_string _) ->
         Misc.fatal_errorf "Symbol projection@ %a@ cannot be applied to:@ %a"
           Symbol_projection.print proj
-          Static_const_with_free_names.print defining_expr
+          Rebuilt_static_const.print defining_expr
     in
     Some simple
   | [] -> None