WIP

Author: vouillon

compiler/lib/inline.ml

@@ -244,20 +244,21 @@ let rec small_function ~live_vars ~env p ~enclosing_function info args =
   with Exit -> true
 
 and should_inline ~live_vars ~env p ~enclosing_function info args =
-  (* Don't inline loops at toplevel *)
-  (not (Option.is_none enclosing_function && contains_loop info p))
   (* 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))
+  (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)
+     || 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))
 
 (****)