Unrevert #1131 and fix a Cmm unboxing bug

backend/cmm.ml

@@ -319,14 +319,10 @@ let iter_shallow_tail f = function
       f e1;
       f e2;
       true
-  | Cregion e ->
-      f e;
-      true
-  | Ctail e ->
-      f e;
-      true
   | Cexit _ | Cop (Craise _, _, _) ->
       true
+  | Cregion _
+  | Ctail _
   | Cconst_int _
   | Cconst_natint _
   | Cconst_float _
@@ -365,12 +361,10 @@ let map_shallow_tail ?kind f = function
   | Ctrywith(e1, kind', id, e2, dbg, kind_before) ->
       Ctrywith(f e1, kind', id, f e2, dbg,
               Option.value kind ~default:kind_before)
-  | Cregion e ->
-      Cregion(f e)
-  | Ctail e ->
-      Ctail(f e)
   | Cexit _ | Cop (Craise _, _, _) as cmm ->
       cmm
+  | Cregion _
+  | Ctail _
   | Cconst_int _
   | Cconst_natint _
   | Cconst_float _
@@ -382,6 +376,8 @@ let map_shallow_tail ?kind f = function
 
 let map_tail ?kind f =
   let rec loop = function
+    | Cregion _
+    | Ctail _
     | Cconst_int _
     | Cconst_natint _
     | Cconst_float _

backend/cmmgen.ml

@@ -394,7 +394,8 @@ let rec is_unboxed_number_cmm = function
           No_unboxing
       end
     | Cexit _ | Cop (Craise _, _, _) -> No_result
-    | Csequence (_, a) | Cregion a | Ctail a
+    | Cregion _ | Ctail _ -> No_unboxing
+    | Csequence (_, a)
     | Clet (_, _, a) | Cphantom_let (_, _, a) | Clet_mut (_, _, _, a) ->
       is_unboxed_number_cmm a
     | Cconst_int _

ocaml/asmcomp/cmm.ml

@@ -268,14 +268,10 @@ let iter_shallow_tail f = function
       f e1;
       f e2;
       true
-  | Cregion e ->
-      f e;
-      true
-  | Ctail e ->
-      f e;
-      true
   | Cexit _ | Cop (Craise _, _, _) ->
       true
+  | Cregion _
+  | Ctail _
   | Cconst_int _
   | Cconst_natint _
   | Cconst_float _
@@ -314,12 +310,10 @@ let map_shallow_tail ?kind f = function
   | Ctrywith(e1, id, e2, dbg, kind_before) ->
       Ctrywith(f e1, id, f e2, dbg,
               Option.value kind ~default:kind_before)
-  | Cregion e ->
-      Cregion(f e)
-  | Ctail e ->
-      Ctail(f e)
   | Cexit _ | Cop (Craise _, _, _) as cmm ->
       cmm
+  | Cregion _
+  | Ctail _
   | Cconst_int _
   | Cconst_natint _
   | Cconst_float _
@@ -331,6 +325,8 @@ let map_shallow_tail ?kind f = function
 
 let map_tail ?kind f =
   let rec loop = function
+    | Cregion _
+    | Ctail _
     | Cconst_int _
     | Cconst_natint _
     | Cconst_float _

ocaml/testsuite/tests/typing-local/regression_cmm_unboxing.ml

@@ -0,0 +1,23 @@
+(* TEST *)
+
+(* Regression test for a bad interaction between Cmm unboxing
+   and regions present after inlining *)
+
+external opaque_local : local_ 'a -> local_ 'a = "%opaque"
+
+let[@inline always] reg k c f =
+  let _ = opaque_local (local_ ref 42) in
+  if c then
+    f ()
+  else
+    Int64.add 1L k
+
+let[@inline never] h k c f =
+  let n = reg k c f in
+  Int64.add 1L n
+
+let () =
+  let f () = 2L in
+  Printf.printf "%Ld %Ld\n"
+    (h 42L false f)
+    (h 42L true f)

ocaml/testsuite/tests/typing-local/regression_cmm_unboxing.reference

@@ -0,0 +1 @@
+44 3