WIP

Author: vouillon

compiler/lib/inline.ml

@@ -108,7 +108,7 @@ let rec block_size ~recurse ~env p { branch; body; _ } =
     body
   +
   match branch with
-  | Cond _ -> 2
+  | Cond _ | Raise _ -> 2
   | Switch (_, a1) -> Array.length a1
   | _ -> 0
 
@@ -143,7 +143,7 @@ let count_init_code info =
     List.fold_left
       ~f:(fun n i ->
         match i with
-        | Let (_, (Closure _ | Field _ | Constant _ | Block _)) -> n + 1
+        | Let (_, (Closure _ | Field (_, _, Non_float) | Constant _ | Block _)) -> n + 1
         | _ -> n)
       ~init:0
       body)
@@ -246,19 +246,19 @@ let rec small_function ~live_vars ~env p ~enclosing_function info args =
 and should_inline ~live_vars ~env p ~enclosing_function info args =
   (* Don't inline function containing closures in JavaScript, except
      in an enclosing scope, since this can results in memory leaks *)
-  (match Config.target () with
-  | `Wasm -> true
-  | `JavaScript -> (
-      match enclosing_function with
-      | Some f -> Var.Set.mem f info.scopes || closure_count info ~env p = 0
-      | None -> true))
-  && ((live_vars.(Var.idx info.f) = 1 && body_size info ~env p < 150)
-     || functor_like ~env p info
-     || (body_size info ~env p <= 1 && closure_count info ~env p = 0)
-     || small_function ~live_vars ~env p ~enclosing_function info args
-        &&
-        (* Avoid inlining loops at toplevel *)
-        not (Option.is_none enclosing_function && contains_loop info p))
+  functor_like ~env p info
+  || (match Config.target () with
+     | `Wasm -> true
+     | `JavaScript -> (
+         match enclosing_function with
+         | Some f -> Var.Set.mem f info.scopes || closure_count info ~env p = 0
+         | None -> true))
+     && ((live_vars.(Var.idx info.f) = 1 && body_size info ~env p < 100)
+        || (body_size info ~env p <= 1 && closure_count info ~env p = 0)
+        || small_function ~live_vars ~env p ~enclosing_function info args
+           &&
+           (* Avoid inlining loops at toplevel *)
+           not (Option.is_none enclosing_function && contains_loop info p))
 
 (****)
 

compiler/lib/js_traverse.ml

@@ -1711,6 +1711,7 @@ class simpl =
           match e2, e1 with
           | ENum n, _ when Num.is_neg n -> EBin (Plus, e1, ENum (Num.neg n))
           | (ENum _ as x), ENum zero when is_zero zero -> x
+          (*          | ENum zero, (ENum _ as x) when is_zero zero -> x*)
           | _ -> e)
       | EFun
           (None, (({ generator = false; async = true | false }, _, body, _) as fun_decl))