clean up, reverse exception inlining

Author: bobzhang

jscomp/bin/whole_compiler.ml

@@ -64529,7 +64529,7 @@ let not_ loc x  : t =
 
 let may_depend = Lam_module_ident.Hash_set.add 
 
-(** drop Lseq (L)*)
+(** drop Lseq (List! ) etc *)
 let rec drop_global_marker (lam : t) =
   match lam with 
   | Lsequence(Lprim{primitive=Pgetglobal id; args = []}, rest) ->
@@ -64803,23 +64803,18 @@ let scc  (groups :  bindings)  ( lam : t) ( body : t)
 type required_modules = Lam_module_ident.Hash_set.t
 
 
-let convert exports lam = 
+let convert exports lam : _ * _  = 
   let alias = Ident_hashtbl.create 64 in 
   let may_depends = Lam_module_ident.Hash_set.create 0 in 
   let rec
     aux (lam : Lambda.lambda) : t = 
     match lam with 
     | Lvar x -> 
       let var = Ident_hashtbl.find_default alias x x in
-      if var == x then 
-        Lvar var 
-      else 
-      if Ident.is_predef_exn var then 
-        Lprim {primitive = Pglobal_exception var;args = []; loc= Location.none }        
-      else if Ident.persistent var then 
+      if Ident.persistent var then 
         Lprim {primitive = Pgetglobal var; args = []; loc = Location.none}
-      else Lvar var   
-
+      else       
+        Lvar var       
     | Lconst x -> 
       Lconst x 
     | Lapply (fn,args,loc) 
@@ -64902,13 +64897,11 @@ let convert exports lam =
           if Ident_set.mem id exports then 
             Llet(kind, id, Lvar new_u, aux body)
           else aux body   
-        | _ ,  Lprim (Pgetglobal u,[], _) 
+        | Alias ,  Lprim (Pgetglobal u,[], _) when not (Ident.is_predef_exn u)
           ->         
-          Ident_hashtbl.add alias id u;
-          if not @@ Ident.is_predef_exn u then
-          begin 
-            may_depend may_depends (Lam_module_ident.of_ml u)
-          end;  
+          Ident_hashtbl.add alias id u;          
+          may_depend may_depends (Lam_module_ident.of_ml u);
+
           if Ident_set.mem id exports then 
             Llet(kind, id, Lvar u, aux body)
           else aux body   

jscomp/core/lam.ml

@@ -1363,23 +1363,18 @@ let scc  (groups :  bindings)  ( lam : t) ( body : t)
 type required_modules = Lam_module_ident.Hash_set.t
 
 
-let convert exports lam = 
+let convert exports lam : _ * _  = 
   let alias = Ident_hashtbl.create 64 in 
   let may_depends = Lam_module_ident.Hash_set.create 0 in 
   let rec
     aux (lam : Lambda.lambda) : t = 
     match lam with 
     | Lvar x -> 
       let var = Ident_hashtbl.find_default alias x x in
-      if var == x then 
-        Lvar var 
-      else 
-      if Ident.is_predef_exn var then 
-        Lprim {primitive = Pglobal_exception var;args = []; loc= Location.none }        
-      else if Ident.persistent var then 
+      if Ident.persistent var then 
         Lprim {primitive = Pgetglobal var; args = []; loc = Location.none}
-      else Lvar var   
-
+      else       
+        Lvar var       
     | Lconst x -> 
       Lconst x 
     | Lapply (fn,args,loc) 
@@ -1462,13 +1457,11 @@ let convert exports lam =
           if Ident_set.mem id exports then 
             Llet(kind, id, Lvar new_u, aux body)
           else aux body   
-        | _ ,  Lprim (Pgetglobal u,[], _) 
+        | Alias ,  Lprim (Pgetglobal u,[], _) when not (Ident.is_predef_exn u)
           ->         
-          Ident_hashtbl.add alias id u;
-          if not @@ Ident.is_predef_exn u then
-          begin 
-            may_depend may_depends (Lam_module_ident.of_ml u)
-          end;  
+          Ident_hashtbl.add alias id u;          
+          may_depend may_depends (Lam_module_ident.of_ml u);
+
           if Ident_set.mem id exports then 
             Llet(kind, id, Lvar u, aux body)
           else aux body   

jscomp/test/exception_alias.js

@@ -3,6 +3,8 @@
 var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions");
 var List                    = require("../../lib/js/list");
 
+var a0 = Caml_builtin_exceptions.not_found;
+
 var b = List.length(/* :: */[
       1,
       /* :: */[
@@ -59,17 +61,15 @@ var List$1 = /* module */[
   /* length */3
 ];
 
-var a0 = Caml_builtin_exceptions.not_found;
-
-var a1 = Caml_builtin_exceptions.not_found;
+var a1 = a0;
 
-var a2 = Caml_builtin_exceptions.not_found;
+var a2 = a0;
 
-var a3 = Caml_builtin_exceptions.not_found;
+var a3 = a0;
 
-var a4 = Caml_builtin_exceptions.not_found;
+var a4 = a0;
 
-var a5 = Caml_builtin_exceptions.not_found;
+var a5 = a0;
 
 exports.a0   = a0;
 exports.a1   = a1;

jscomp/test/global_exception_regression_test.js

@@ -4,12 +4,18 @@ var Block                   = require("../../lib/js/block");
 var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions");
 var Mt                      = require("./mt");
 
+var v = Caml_builtin_exceptions.not_found;
+
+var u = Caml_builtin_exceptions.not_found;
+
+var s = Caml_builtin_exceptions.end_of_file;
+
 var suites_000 = /* tuple */[
   "not_found_equal",
   function () {
     return /* Eq */Block.__(0, [
-              Caml_builtin_exceptions.not_found,
-              Caml_builtin_exceptions.not_found
+              u,
+              v
             ]);
   }
 ];
@@ -19,8 +25,8 @@ var suites_001 = /* :: */[
     "not_found_not_equal_end_of_file",
     function () {
       return /* Neq */Block.__(1, [
-                Caml_builtin_exceptions.not_found,
-                Caml_builtin_exceptions.end_of_file
+                u,
+                s
               ]);
     }
   ],
@@ -34,12 +40,6 @@ var suites = /* :: */[
 
 Mt.from_pair_suites("global_exception_regression_test.ml", suites);
 
-var v = Caml_builtin_exceptions.not_found;
-
-var u = Caml_builtin_exceptions.not_found;
-
-var s = Caml_builtin_exceptions.end_of_file;
-
 exports.v      = v;
 exports.u      = u;
 exports.s      = s;