More invariant

Author: hhugo

compiler/lib/generate_closure.ml

@@ -323,8 +323,11 @@ let f p : Code.program =
       (fun pc _ (blocks, free_pc) ->
         (* make sure we have the latest version *)
         let block = Addr.Map.find pc blocks in
-        let free_pc, blocks, body = rewrite_closures free_pc blocks block.body in
-        Addr.Map.add pc { block with body } blocks, free_pc)
+        if List.exists block.body ~f:(function (Let (_, Closure _)) -> true | _ -> false)
+        then 
+          let free_pc, blocks, body = rewrite_closures free_pc blocks block.body in
+          Addr.Map.add pc { block with body } blocks, free_pc
+        else blocks, free_pc)
       p.blocks
       (p.blocks, p.free_pc)
   in

compiler/lib/lambda_lifting.ml

@@ -225,15 +225,16 @@ let rec traverse var_depth (program, functions) pc depth limit =
     program.blocks
     (program, functions)
 
-let f program =
+let f p =
   let t = Timer.make () in
   let nv = Var.count () in
   let var_depth = Array.make nv (-1) in
-  let program, functions =
+  let p, functions =
     let threshold = Config.Param.lambda_lifting_threshold () in
     let baseline = Config.Param.lambda_lifting_baseline () in
-    traverse var_depth (program, []) program.start 0 (baseline + threshold)
+    traverse var_depth (p, []) p.start 0 (baseline + threshold)
   in
   assert (List.is_empty functions);
   if Debug.find "times" () then Format.eprintf "  lambda lifting: %a@." Timer.print t;
-  program
+  Code.invariant p;
+  p

compiler/lib/specialize_js.ml

@@ -448,7 +448,9 @@ let f_once_before p =
   let blocks =
     Addr.Map.map (fun block -> { block with Code.body = loop [] block.body }) p.blocks
   in
-  { p with blocks }
+  let p = { p with blocks } in
+  Code.invariant p;
+  p
 
 let rec args_equal xs ys =
   match xs, ys with
@@ -491,5 +493,7 @@ let f_once_after p =
         (fun block -> { block with Code.body = List.map block.body ~f })
         p.blocks
     in
-    Deadcode.remove_unused_blocks { p with blocks }
+    let p = Deadcode.remove_unused_blocks { p with blocks } in
+    Code.invariant p;
+    p
   else p