Merge branch 'instance-typing' into instantiate

Author: lukemaurer

.github/CODEOWNERS

@@ -6,6 +6,4 @@ flambda_backend.opam    @mshinwell @lthls
 
 build_ocaml_compiler.sexp       @poechsel
 
-chamelon/                       @Ekdohibs
-
 external/memtrace/              @stedolan

backend/asmgen.ml

@@ -279,8 +279,12 @@ let compile_fundecl ~ppf_dump ~funcnames fd_cmm =
   ++ pass_dump_if ppf_dump dump_selection "After instruction selection"
   ++ Profile.record ~accumulate:true "save_mach_as_cfg"
        (save_mach_as_cfg Compiler_pass.Selection)
-  ++ Profile.record ~accumulate:true "polling"
-       (Polling.instrument_fundecl ~future_funcnames:funcnames)
+   ++ Profile.record ~accumulate:true "polling"
+       (fun fd ->
+         match register_allocator with
+         | IRC | LS | GI -> fd
+         | Upstream ->
+           Polling.instrument_fundecl ~future_funcnames:funcnames fd)
   ++ Compiler_hooks.execute_and_pipe Compiler_hooks.Mach_polling
   ++ (fun fd ->
       match !Flambda_backend_flags.cfg_zero_alloc_checker with
@@ -320,6 +324,7 @@ let compile_fundecl ~ppf_dump ~funcnames fd_cmm =
         let cfg =
           fd
           ++ Profile.record ~accumulate:true "cfgize" cfgize
+          ++ Profile.record ~accumulate:true "cfg_polling" (Cfg_polling.instrument_fundecl ~future_funcnames:funcnames)
           ++ (fun cfg_with_layout ->
               match !Flambda_backend_flags.cfg_zero_alloc_checker with
               | false -> cfg_with_layout

backend/cfg/cfg.ml

@@ -83,11 +83,12 @@ type t =
     entry_label : Label.t;
     fun_contains_calls : bool;
     (* CR-someday gyorsh: compute locally. *)
-    fun_num_stack_slots : int array
+    fun_num_stack_slots : int array;
+    fun_poll : Lambda.poll_attribute
   }
 
 let create ~fun_name ~fun_args ~fun_codegen_options ~fun_dbg ~fun_contains_calls
-    ~fun_num_stack_slots =
+    ~fun_num_stack_slots ~fun_poll =
   { fun_name;
     fun_args;
     fun_codegen_options;
@@ -97,7 +98,8 @@ let create ~fun_name ~fun_args ~fun_codegen_options ~fun_dbg ~fun_contains_calls
        currently rely on it to be initialized as above. *)
     blocks = Label.Tbl.create 31;
     fun_contains_calls;
-    fun_num_stack_slots
+    fun_num_stack_slots;
+    fun_poll
   }
 
 let mem_block t label = Label.Tbl.mem t.blocks label

backend/cfg/cfg.mli

@@ -87,7 +87,7 @@ type codegen_option =
 val of_cmm_codegen_option : Cmm.codegen_option list -> codegen_option list
 
 (** Control Flow Graph of a function. *)
-type t = private
+type t =
   { blocks : basic_block Label.Tbl.t;  (** Map from labels to blocks *)
     fun_name : string;  (** Function name, used for printing messages *)
     fun_args : Reg.t array;
@@ -99,9 +99,11 @@ type t = private
     fun_dbg : Debuginfo.t;  (** Dwarf debug info for function entry. *)
     entry_label : Label.t;
         (** This label must be the first in all layouts of this cfg. *)
-    fun_contains_calls : bool;  (** Precomputed at selection time. *)
-    fun_num_stack_slots : int array
+    fun_contains_calls : bool;
+        (** Precomputed during selection and poll insertion. *)
+    fun_num_stack_slots : int array;
         (** Precomputed at register allocation time *)
+    fun_poll : Lambda.poll_attribute (* Whether to insert polling points. *)
   }
 
 val create :
@@ -111,6 +113,7 @@ val create :
   fun_dbg:Debuginfo.t ->
   fun_contains_calls:bool ->
   fun_num_stack_slots:int array ->
+  fun_poll:Lambda.poll_attribute ->
   t
 
 val fun_name : t -> string