Restore optim for objects directly under a top-level module

1 files changed, 7 insertions, 0 deletions

diff --git a/lambda/translclass.ml b/lambda/translclass.ml
index 29547d5201..ef07150232 100644
--- a/lambda/translclass.ml
+++ b/lambda/translclass.ml
@@ -529,12 +529,19 @@ let transl_class_rebind ~scopes cl vf =
 
 (* Rewrite a closure using builtins. Improves native code size. *)
 
+let module_path = function
+    Lvar id ->
+      let s = Ident.name id in s <> "" && s.[0] >= 'A' && s.[0] <= 'Z'
+  | Lprim(Pgetglobal _, [], _) -> true
+  | _                          -> false
+
 let const_path local = function
     Lvar id -> not (List.mem id local)
   | Lconst _ -> true
   | Lfunction {kind = Curried; body} ->
       let fv = free_variables body in
       List.for_all (fun x -> not (Ident.Set.mem x fv)) local
+  | Lprim(Pfield _, [p], _) -> module_path p
   | _ -> false
 
 let rec builtin_meths self env env2 body =