Compiler: fix inlining 2106

Author: hhugo

compiler/lib/duplicate.ml

@@ -60,8 +60,15 @@ let rec blocks_to_rename p pc lst =
     p.blocks
     lst
 
-let closure p ~f ~params ~cont =
-  let s = Subst.from_map (bound_variables p ~f ~params ~cont) in
+let closure p ~f ~params ~cont live_vars =
+  let s =
+    let map = bound_variables p ~f ~params ~cont in
+    fun x ->
+      try Var.Map.find x map
+      with Not_found ->
+        live_vars.(Var.idx x) <- live_vars.(Var.idx x) + 1;
+        x
+  in
   let pc, args = cont in
   let blocks = blocks_to_rename p pc [] in
   let free_pc, m =

compiler/lib/duplicate.mli

@@ -21,6 +21,7 @@ val closure :
   -> f:Code.Var.t
   -> params:Code.Var.t list
   -> cont:int * Code.Var.t list
+  -> int Array.t
   -> Code.program * Code.Var.t * Code.Var.t list * (int * Code.Var.t list)
 (** Given a program and a closure [f] -- defined by its name,
     parameters, and its continuation --, return a program with a copy

compiler/lib/inline.ml

@@ -643,7 +643,9 @@ and inline_function ~context i x f args rem state =
     let p, params, cont =
       if context.live_vars.(Var.idx f) > 0
       then (
-        let p, _f, params, cont = Duplicate.closure p ~f ~params ~cont in
+        let p, _f, params, cont =
+          Duplicate.closure p ~f ~params ~cont context.live_vars
+        in
         (* It's ok to ignore the [_f] because the function is not recursive *)
         assert (not info.recursive);
         p, params, cont)