WIP

Author: hhugo

compiler/lib/eval.ml

@@ -729,7 +729,7 @@ end = struct
     | Apply { f; args; exact } -> Apply { f = s f; args = List.map args ~f:s; exact }
     | Block (n, a, k, mut) -> Block (n, Array.map a ~f:s, k, mut)
     | Field (x, n, typ) -> Field (s x, n, typ)
-    | Closure (l, pc, loc) -> Closure (List.map l ~f:s, subst_cont s pc, loc)
+    | Closure (l, pc, loc) -> Closure (l, subst_cont s pc, loc)
     | Special _ -> e
     | Prim (p, l) ->
         Prim
@@ -783,15 +783,15 @@ end = struct
     in
     block s d blk
 
-  let i_equal a b =
+  let instr_equal a b =
     match a, b with
     | Event _, Event _ -> true
     | Event _, _ | _, Event _ -> false
     | a, b -> Poly.equal a b
 
   let equal a b =
     List.equal ~eq:Var.equal a.params b.params
-    && List.equal ~eq:i_equal a.body b.body
+    && List.equal ~eq:instr_equal a.body b.body
     && Poly.equal a.branch b.branch
 
   let hash (x : block) = Hashtbl.hash x
@@ -816,11 +816,12 @@ let eval_branch blocks update_branch info l =
           incr update_branch;
           Branch cont
       | None ->
-          let t = SBT.create 18 in
+          let t = SBT.create 0 in
+          let seen_pc = Addr.Hashtbl.create 0 in
           Switch
             ( x
             , Array.map a ~f:(function
-                | pc, [] -> (
+                | pc, [] when not (Addr.Hashtbl.mem seen_pc pc) -> (
                     let block = Code.Addr.Map.find pc blocks in
                     let sb = Simple_block.make block in
                     match SBT.find_opt t sb with
@@ -829,6 +830,7 @@ let eval_branch blocks update_branch info l =
                         pc', []
                     | Some _ | None ->
                         SBT.add t sb pc;
+                        Addr.Hashtbl.add seen_pc pc ();
                         pc, [])
                 | cont -> cont) ))
   | cont -> cont