Merge pull request #3874 from BuckleScript/upgrade_ocaml_compiler_fix

bobzhang · web-flow · commit 2cc36bf467c9 · 2019-10-15T14:35:42.000+08:00
update a fix in ocaml compiler patch, not looking up aggressive
diff --git a/lib/4.02.3/unstable/js_compiler.ml b/lib/4.02.3/unstable/js_compiler.ml
@@ -46604,7 +46604,7 @@ and lookup_module ~load lid env : Path.t =
           raise Recmodule
                   
         | Mty_alias (Path.Pident id) ->   
-          if !Clflags.bs_only && not !Clflags.transparent_modules then 
+          if !Clflags.bs_only && not !Clflags.transparent_modules && Ident.persistent id then 
             find_pers_struct (Ident.name id) |> ignore 
             
         | _ -> ()
diff --git a/lib/4.02.3/whole_compiler.ml b/lib/4.02.3/whole_compiler.ml
@@ -34801,7 +34801,7 @@ and lookup_module ~load lid env : Path.t =
           raise Recmodule
                   
         | Mty_alias (Path.Pident id) ->   
-          if !Clflags.bs_only && not !Clflags.transparent_modules then 
+          if !Clflags.bs_only && not !Clflags.transparent_modules && Ident.persistent id then 
             find_pers_struct (Ident.name id) |> ignore 
             
         | _ -> ()
diff --git a/ocaml b/ocaml
@@ -1 +1 @@
-Subproject commit 698e60f3cd2f442f2013e79860ce2f7b0a9624cb
+Subproject commit 5a79f18a807acf1046f460e3a1deeb44ed0fdd61
