Merge commit '86c8a98f3c36b25c2e3f2185c24809d0babad5b4' into parallel_minor_gc_4_12

1 files changed, 5 insertions, 6 deletions

diff --git a/asmcomp/schedgen.ml b/asmcomp/schedgen.ml
index 35fe1ec95c..39eff88fca 100644
--- a/asmcomp/schedgen.ml
+++ b/asmcomp/schedgen.ml
@@ -148,9 +148,9 @@ val mutable trywith_nesting = 0
    that terminate a basic block. *)
 
 method oper_in_basic_block = function
-    Icall_ind _ -> false
+    Icall_ind -> false
   | Icall_imm _ -> false
-  | Itailcall_ind _ -> false
+  | Itailcall_ind -> false
   | Itailcall_imm _ -> false
   | Iextcall _ -> false
   | Istackoffset _ -> false
@@ -185,8 +185,8 @@ method is_load = function
   | _ -> false
 
 method is_checkbound = function
-    Iintop (Icheckbound _) -> true
-  | Iintop_imm(Icheckbound _, _) -> true
+    Iintop(Icheckbound) -> true
+  | Iintop_imm(Icheckbound, _) -> true
   | _ -> false
 
 method private instr_is_store instr =
@@ -376,7 +376,7 @@ method schedule_fundecl f =
     else begin
       let critical_outputs =
         match i.desc with
-          Lop(Icall_ind _ | Itailcall_ind _) -> [| i.arg.(0) |]
+          Lop(Icall_ind | Itailcall_ind) -> [| i.arg.(0) |]
         | Lop(Icall_imm _ | Itailcall_imm _ | Iextcall _) -> [||]
         | Lreturn -> [||]
         | _ -> i.arg in
@@ -392,7 +392,6 @@ method schedule_fundecl f =
       fun_body = new_body;
       fun_fast = f.fun_fast;
       fun_dbg  = f.fun_dbg;
-      fun_spacetime_shape = f.fun_spacetime_shape;
       fun_tailrec_entry_point_label = f.fun_tailrec_entry_point_label;
       fun_contains_calls = f.fun_contains_calls;
       fun_num_stack_slots = f.fun_num_stack_slots;