clean up

Author: bobzhang

jscomp/bin/whole_compiler.ml

@@ -0,0 +1,7 @@
+
+
+Global exports identifiers are extracted from {!Translmod.get_export_identifiers} 
+instead of inferred from lambda expression or cmi file.
+
+1. We need be careful about externals.
+2. Reading from fresh generated cmi is expensive.

jscomp/core/global_exports.adoc

@@ -45,7 +45,7 @@ type primitive =
   | Pbytes_of_string
   (* Globals *)
   | Pgetglobal of ident
-  | Psetglobal of ident
+  (* | Psetglobal of ident *)
   | Pglobal_exception of ident       
   (* Operations on heap blocks *)
   | Pmakeblock of int * tag_info * mutable_flag
@@ -996,7 +996,13 @@ let lam_prim ~primitive:( p : Lambda.primitive) ~args loc  : t =
       prim ~primitive:(Pglobal_exception id) ~args loc       
     else       
       prim ~primitive:(Pgetglobal id) ~args loc
-  | Psetglobal id -> prim ~primitive:(Psetglobal id) ~args loc
+  | Psetglobal id -> 
+    (* we discard [Psetglobal] in the beginning*)
+    begin match args with 
+    | [biglambda] -> biglambda
+    | _ -> assert false 
+    end
+    (* prim ~primitive:(Psetglobal id) ~args loc *)
   | Pmakeblock (tag,info, mutable_flag) 
     -> prim ~primitive:(Pmakeblock (tag,info,mutable_flag)) ~args loc
   | Pfield (id,info) 

jscomp/core/lam.ml

@@ -50,7 +50,7 @@ type primitive =
   | Pbytes_to_string
   | Pbytes_of_string
   | Pgetglobal of ident
-  | Psetglobal of ident
+  (* | Psetglobal of ident *)
   | Pglobal_exception of ident             
   | Pmakeblock of int * Lambda.tag_info * Asttypes.mutable_flag
   | Pfield of int * Lambda.field_dbg_info

jscomp/core/lam.mli

@@ -171,7 +171,8 @@ let rec no_side_effects (lam : Lam.t) : bool =
       | Plazyforce 
       | Psetfield _ 
       | Psetfloatfield _
-      | Psetglobal _ -> false 
+      (* | Psetglobal _  *)
+        -> false 
     )
   | Llet (_,_, arg,body) -> no_side_effects arg && no_side_effects body 
   | Lswitch (_,_) -> false