PR#6600 (cont.) [applying patch on behalf of garrigue]

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16079 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

typing/env.ml

@@ -995,7 +995,7 @@ let iter_env_cont = ref []
 let rec scrape_alias_safe env mty =
   match mty with
   | Mty_alias (Pident id) when Ident.persistent id -> false
-  | Mty_alias path ->
+  | Mty_alias path -> (* PR#6600: find_module may raise Not_found *)
       scrape_alias_safe env (find_module path env).md_type
   | _ -> true
 
@@ -1006,7 +1006,8 @@ let iter_env proj1 proj2 f env () =
       let safe =
         match EnvLazy.get_arg mcomps with
           None -> true
-        | Some (env, sub, path, mty) -> scrape_alias_safe env mty
+        | Some (env, sub, path, mty) ->
+            try scrape_alias_safe env mty with Not_found -> false
       in
       if not safe then () else
       match EnvLazy.force !components_of_module_maker' mcomps with