Merge pull request #3787 from BuckleScript/integrate_with_upstream_compiler_changes

Integrate upstream compiler changes

Author: bobzhang

jscomp/core/js_dump.ml

@@ -890,7 +890,7 @@ and expression_desc cxt (level:int) f x : cxt  =
                                  E.array mutable_flag 
                                    (Ext_list.map el drop_comment) ]
                             )
-        | Blk_module (Some labels) ->         
+        | Blk_module labels ->         
           dbg_local_module f;
           P.paren_group f 1 (fun _ -> arguments cxt f 
                                 [E.array Immutable
@@ -930,7 +930,7 @@ and expression_desc cxt (level:int) f x : cxt  =
 #end      
         | Blk_extension_slot
         | Blk_na
-        | Blk_module None ->           
+           ->           
           dbg_block_create f;
           P.paren_group f 1 (fun _ -> arguments cxt f [tag; E.array mutable_flag el])
     )

jscomp/core/js_exp_make.ml

@@ -181,7 +181,7 @@ let make_block ?comment
         if i <> 0 then merge_outer_comment des.(i-1) e else e) 
 #end         
     (* TODO: may overriden its previous comments *)
-    | Blk_module (Some des) 
+    | Blk_module des
       ->  Ext_list.map2 des es merge_outer_comment             
     | _ -> es 
   in

jscomp/core/js_of_lam_module.ml

@@ -29,8 +29,8 @@
 
 module E = Js_exp_make 
 
-let make ?comment (args : J.expression list) =
+let make ?comment names (args : J.expression list) =
   E.make_block
     ?comment E.zero_int_literal
-    (Blk_module None) args Immutable
+    (Blk_module names) args Immutable
 

jscomp/core/js_of_lam_module.mli

@@ -29,5 +29,6 @@
 
 val make :
   ?comment:string ->
+  string list ->
   J.expression list -> J.expression
 

jscomp/core/lam_compile_global.ml

@@ -45,8 +45,9 @@ let expand_global_module_as_lam id env =
     ~not_found:(fun id -> assert false)
     ~found:(fun {signature ; _} 
              -> 
+               let names = Ocaml_types.map (fun name -> name) signature in 
                Lam.prim
-                 ~primitive:(Pmakeblock(0, Blk_module None, Immutable))  
+                 ~primitive:(Pmakeblock(0, Blk_module names, Immutable))  
                  ~args:(
                    let len = Ocaml_types.length signature in 
                    Ext_list.init len (fun i  -> 
@@ -64,7 +65,8 @@ let expand_global_module  id env  : J.expression =
     (Has_env env)
     ~not_found:(fun _ -> assert false)
     ~found:(fun   {signature; _} -> 
-        Js_of_lam_module.make ~comment:id.name 
+        let names = Ocaml_types.map (fun name -> name) signature in 
+        Js_of_lam_module.make ~comment:id.name names
           (Ocaml_types.map (fun name -> E.ml_var_dot id name) signature )
       )
 

jscomp/core/lam_tag_info.ml

@@ -33,7 +33,7 @@ type t =
   | Blk_array
   | Blk_variant of string 
   | Blk_record of string array 
-  | Blk_module of string list option
+  | Blk_module of string list
   | Blk_extension_slot
   | Blk_na
 #if OCAML_VERSION =~ ">4.03.0" then

jscomp/runtime/caml_module.ml

@@ -32,7 +32,7 @@ type shape =
    | Function
    | Lazy
    | Class
-   | Module of shape array
+   | Module of (shape * string) array
    | Value of Caml_obj_extern.t
 (* ATTENTION: check across versions *)
 module Array = Caml_array_extern 
@@ -58,7 +58,7 @@ let init_mod (loc : string * int * int) (shape : shape) =
       struct_.(idx)<- v ;
       let len = Array.length comps in
       for i = 0 to len - 1 do 
-        loop comps.(i) v i       
+        loop (fst comps.(i)) v i       
       done
     | Value v ->
        struct_.(idx) <- v in
@@ -80,12 +80,12 @@ let update_mod (shape : shape)  (o : Caml_obj_extern.t)  (n : Caml_obj_extern.t)
     | Module comps 
       -> 
       for i = 0 to Array.length comps - 1 do 
-        aux comps.(i) (Caml_obj_extern.field o i) (Caml_obj_extern.field n i) o i       
+        aux (fst comps.(i)) (Caml_obj_extern.field o i) (Caml_obj_extern.field n i) o i       
       done
     | Value _ -> () in 
   match shape with 
   | Module comps -> 
     for i = 0 to Array.length comps - 1 do  
-      aux comps.(i) (Caml_obj_extern.field o i) (Caml_obj_extern.field n i) o  i
+      aux (fst comps.(i)) (Caml_obj_extern.field o i) (Caml_obj_extern.field n i) o  i
     done
   |  _ -> assert false 

jscomp/test/basic_module_test.js

@@ -8,7 +8,7 @@ var Mt_global = require("./mt_global.js");
 
 var count = /* record */[/* contents */0];
 
-var M = [Offset.M[/* Set */1]];
+var M = /* module */[/* Set */Offset.M[/* Set */1]];
 
 function test(set) {
   count[0] = Curry._1(M[/* Set */0][/* cardinal */18], set) + count[0] | 0;