review changes

Author: stedolan

backend/amd64/proc.ml

@@ -385,6 +385,8 @@ let max_register_pressure =
     consumes ~int:1 ~float:0
   | Istore(Single, _, _) | Icompf _ ->
     consumes ~int:0 ~float:1
+  | Iendregion ->
+    consumes ~int:1 ~float:0
   | Iintop(Iadd | Isub | Imul | Imulh _ | Iand | Ior | Ixor | Ilsl | Ilsr | Iasr
            | Ipopcnt|Iclz _| Ictz _|Icheckbound)
   | Iintop_imm((Iadd | Isub | Imul | Imulh _ | Iand | Ior | Ixor | Ilsl | Ilsr
@@ -404,7 +406,7 @@ let max_register_pressure =
              | Ioffset_loc (_, _) | Ifloatarithmem (_, _)
              | Ibswap _ | Ifloatsqrtf _ | Isqrtf)
   | Iname_for_debugger _ | Iprobe _ | Iprobe_is_enabled _ | Iopaque
-  | Ibeginregion | Iendregion
+  | Ibeginregion
     -> consumes ~int:0 ~float:0
 
 (* Pure operations (without any side effect besides updating their result

backend/arm64/proc.ml

@@ -288,6 +288,7 @@ let op_is_pure = function
   | Icall_ind | Icall_imm _ | Itailcall_ind | Itailcall_imm _
   | Iextcall _ | Istackoffset _ | Istore _ | Ialloc _
   | Iintop(Icheckbound) | Iintop_imm(Icheckbound, _) | Iopaque
+  | Ibeginregion | Iendregion
   | Ispecific(Ishiftcheckbound _) -> false
   | _ -> true
 

backend/cmm.mli

@@ -296,7 +296,7 @@ val map_tail: (expression -> expression) -> expression -> expression
       by recursively applying map_shallow_tail *)
 
 val iter_shallow: (expression -> unit) -> expression -> unit
-  (** Apply the transformation to each immediate sub-expression. *)
+  (** Apply the callback to each immediate sub-expression. *)
 
 val map_shallow: (expression -> expression) -> expression -> expression
   (** Apply the transformation to each immediate sub-expression. *)

backend/cmm_helpers.ml

@@ -611,7 +611,7 @@ let box_float dbg m c = Cop(Calloc m, [alloc_float_header m dbg; c], dbg)
 let unbox_float dbg =
   map_tail
     (function
-      | Cop(Calloc Alloc_heap, [Cconst_natint (hdr, _); c], _)
+      | Cop(Calloc _, [Cconst_natint (hdr, _); c], _)
         when Nativeint.equal hdr float_header ->
           c
       | Cconst_symbol (s, _dbg) as cmm ->
@@ -1190,20 +1190,20 @@ let unbox_int dbg bi =
   in
   map_tail
     (function
-      | Cop(Calloc Alloc_heap,
+      | Cop(Calloc _,
             [hdr; ops;
              Cop(Clsl, [contents; Cconst_int (32, _)], _dbg')], _dbg)
         when bi = Primitive.Pint32 && size_int = 8 && big_endian
              && alloc_matches_boxed_int bi ~hdr ~ops ->
           (* Force sign-extension of low 32 bits *)
           sign_extend_32 dbg contents
-      | Cop(Calloc Alloc_heap,
+      | Cop(Calloc _,
             [hdr; ops; contents], _dbg)
         when bi = Primitive.Pint32 && size_int = 8 && not big_endian
              && alloc_matches_boxed_int bi ~hdr ~ops ->
           (* Force sign-extension of low 32 bits *)
           sign_extend_32 dbg contents
-      | Cop(Calloc Alloc_heap, [hdr; ops; contents], _dbg)
+      | Cop(Calloc _, [hdr; ops; contents], _dbg)
         when alloc_matches_boxed_int bi ~hdr ~ops ->
           contents
       | Cconst_symbol (s, _dbg) as cmm ->

backend/cmmgen.ml

@@ -285,7 +285,7 @@ let equal_boxed_number bn1 bn2 =
   match bn1, bn2 with
   | Boxed_float _, Boxed_float _ -> true
   | Boxed_integer(ui1, m, _), Boxed_integer(ui2, m', _) ->
-    equal_unboxed_integer ui1 ui2 && m = m'
+    equal_unboxed_integer ui1 ui2 && Lambda.eq_mode m m'
   | _, _ -> false
 
 let box_number bn arg =
@@ -526,7 +526,7 @@ let rec transl env e =
             bigarray_get unsafe elt_kind layout
               (transl env arg1) (List.map (transl env) argl) dbg in
           begin match elt_kind with
-          (* TODO: local alloaction of bigarray elements *)
+          (* TODO: local allocation of bigarray elements *)
             Pbigarray_float32 | Pbigarray_float64 -> box_float dbg Alloc_heap elt
           | Pbigarray_complex32 | Pbigarray_complex64 -> elt
           | Pbigarray_int32 -> box_int dbg Pint32 Alloc_heap elt

backend/comballoc.ml

@@ -58,7 +58,7 @@ let rec combine i allocstate =
            match state with
            | No_alloc -> assert false
            | Pending_alloc { totalsz; dbginfos; mode = m; _ } ->
-              assert (m = mode);
+              assert (Lambda.eq_mode m mode);
               totalsz, dbginfos in
          let next =
            let offset = totalsz - sz in