remove lazy_tag

Author: bobzhang

Diff for: jscomp/ext/config.ml

@@ -22,10 +22,10 @@ let interface_suffix = ref ".mli"
 (* This is normally the same as in obj.ml, but we have to define it
    separately because it can differ when we're in the middle of a
    bootstrapping phase. *)
-let lazy_tag = 246
 
 
 
+let default_uncurry = ref false
 
 let print_config oc =
   let p name valu = Printf.fprintf oc "%s: %s\n" name valu in

Diff for: jscomp/ext/config.mli

@@ -43,11 +43,8 @@ val ast_impl_magic_number: string
 val cmt_magic_number: string
         (* Magic number for compiled interface files *)
 
-val lazy_tag : int
-        (* Normally the same as Obj.lazy_tag.  Separate definition because
-           of technical reasons for bootstrapping. *)
-
 
+val default_uncurry : bool ref 
 val print_config : out_channel -> unit;;
 
 

Diff for: jscomp/main/rescript_compiler_main.ml

@@ -433,7 +433,8 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
 
     "-nopervasives", set Clflags.nopervasives, 
     "*internal*";
-
+    "-bs-uncurry", set Config.default_uncurry,
+    "*internal" ;
     "-v", unit_call print_version_string,
     "Print compiler version and location of standard library and exit";  
 

Diff for: jscomp/ml/translcore.ml

@@ -872,39 +872,8 @@ and transl_exp0 e =
       (* when e needs no computation (constants, identifiers, ...), we
          optimize the translation just as Lazy.lazy_from_val would
          do *)
-      if !Config.bs_only then
-        Lprim(Pmakeblock(Config.lazy_tag, Blk_lazy_general, Mutable, None), [transl_exp e], e.exp_loc)
-      else
-      begin match Typeopt.classify_lazy_argument e with
-      | `Constant_or_function ->
-        (* a constant expr of type <> float gets compiled as itself *)
-         transl_exp e
-      | `Float -> 
-          (* We don't need to wrap with Popaque: this forward
-             block will never be shortcutted since it points to a float. *)
-          Lprim(Pmakeblock(Obj.forward_tag, Lambda.default_tag_info (*IIRELEVANT*), Immutable, None),
-                [transl_exp e], e.exp_loc)
-      | `Identifier `Forward_value ->
-         (* CR-someday mshinwell: Consider adding a new primitive
-            that expresses the construction of forward_tag blocks.
-            We need to use [Popaque] here to prevent unsound
-            optimisation in Flambda, but the concept of a mutable
-            block doesn't really match what is going on here.  This
-            value may subsequently turn into an immediate... *)
-         Lprim (Popaque,
-                [Lprim(Pmakeblock(Obj.forward_tag, Lambda.default_tag_info (*IIRELEVANT*), Immutable, None),
-                       [transl_exp e], e.exp_loc)],
-                e.exp_loc)
-      | `Identifier `Other ->
-         transl_exp e
-      | `Other ->
-         (* other cases compile to a lazy block holding a function *)
-         let fn = Lfunction {kind = Curried; params = [Ident.create "param"];
-                             attr = default_function_attribute;
-                             loc = e.exp_loc;
-                             body = transl_exp e} in
-          Lprim(Pmakeblock(Config.lazy_tag, Lambda.default_tag_info (*IIRELEVANT*), Mutable, None), [fn], e.exp_loc)
-      end
+      Lprim(Pmakeblock(0, Blk_lazy_general, Mutable, None), [transl_exp e], e.exp_loc)
+     
   | Texp_object () ->
       assert false
   | Texp_unreachable ->