discard the hash value in the early stage

FIXME: disable hash collision test

Author: bobzhang

jscomp/core/js_dump.ml

@@ -167,7 +167,7 @@ let exp_need_paren  (e : J.expression) =
 
   | Raw_js_code {code_info = Exp _}
   | Fun _ 
-  | Caml_block (_,_,_, (Blk_record _ | Blk_module _ | Blk_poly_var _ | Blk_extension | Blk_record_ext _ | Blk_record_inlined _ | Blk_constructor _ ))
+  | Caml_block (_,_,_, (Blk_record _ | Blk_module _ | Blk_poly_var  | Blk_extension | Blk_record_ext _ | Blk_record_inlined _ | Blk_constructor _ ))
   | Object _ -> true
   | Raw_js_code {code_info = Stmt _ }
   | Length _
@@ -823,9 +823,9 @@ and expression_desc cxt ~(level:int) f x : cxt  =
       expression_desc cxt ~level f (Object 
         ((Ext_list.combine_array fields el  (fun i -> Js_op.Lit i))))      
 
-  | Caml_block(el,_,_, Blk_poly_var name) ->
+  | Caml_block(el,_,_, Blk_poly_var ) ->
     begin match el with 
-      | [_;value] -> 
+      | [{expression_desc = Str (_,name)};value] -> 
         expression_desc 
           cxt 
           ~level 

jscomp/core/js_exp_make.ml

@@ -255,7 +255,7 @@ let dummy_obj ?comment (info : Lam_tag_info.t)  : t =
   | Blk_module _ 
   | Blk_constructor _ 
   | Blk_record_inlined _ 
-  | Blk_poly_var _ 
+  | Blk_poly_var  
   | Blk_extension 
   | Blk_record_ext _ 
     -> 

jscomp/core/js_of_lam_variant.ml

@@ -50,7 +50,7 @@ let eval (arg : J.expression) (dispatches : (Ast_compatible.hash_label * string)
 (** arg is a polyvar *)
 let eval_as_event (arg : J.expression) (dispatches : (Ast_compatible.hash_label * string) list ) =
   match arg.expression_desc with
-  | Caml_block([_hash; cb], _, _, Blk_poly_var s) when Js_analyzer.no_side_effect_expression cb 
+  | Caml_block([{expression_desc = Str(_,s)}; cb], _, _, Blk_poly_var ) when Js_analyzer.no_side_effect_expression cb 
     -> 
     let v = Ext_list.assoc_by_string dispatches s None in
     Splice2(E.str v , cb )

jscomp/core/lam_compile_util.ml

@@ -45,7 +45,7 @@ let comment_of_tag_info  (x : Lam_tag_info.t) =
   | Blk_constructor {name = n} -> Some n 
   | Blk_tuple -> Some "tuple"
   | Blk_class -> Some "class"
-  | Blk_poly_var _ -> None
+  | Blk_poly_var  -> None
   | Blk_record _ -> None
   | Blk_record_inlined {name = ctor} -> Some ctor
   | Blk_record_ext _ -> None

jscomp/core/lam_constant_convert.ml

@@ -72,8 +72,12 @@ let rec convert_constant ( const : Lambda.structured_constant) : Lam_constant.t
       let t : Lam_tag_info.t = Blk_array in 
       Const_block (i,t, Ext_list.map xs convert_constant )
     | Blk_poly_var s -> 
-      let t : Lam_tag_info.t = Blk_poly_var s in 
-      Const_block (i,t, Ext_list.map xs convert_constant )      
+     begin match xs with 
+     | [_; value] -> 
+      let t : Lam_tag_info.t = Blk_poly_var  in 
+      Const_block (i,t, [Const_string s; convert_constant value] )      
+    | _ -> assert false  
+    end
     | Blk_record s -> 
       let t : Lam_tag_info.t = Blk_record s in 
       Const_block (i,t, Ext_list.map xs convert_constant )

jscomp/core/lam_convert.ml

@@ -261,10 +261,7 @@ let lam_prim ~primitive:( p : Lambda.primitive) ~args loc : Lam.t =
       prim ~primitive:(Pmakeblock (tag,info,mutable_flag)) ~args loc  
     | Blk_array -> 
       let info : Lam_tag_info.t = Blk_array in
-      prim ~primitive:(Pmakeblock (tag,info,mutable_flag)) ~args loc
-    | Blk_poly_var s -> 
-      let info : Lam_tag_info.t = Blk_poly_var s in
-      prim ~primitive:(Pmakeblock (tag,info,mutable_flag)) ~args loc
+      prim ~primitive:(Pmakeblock (tag,info,mutable_flag)) ~args loc    
     | Blk_record s -> 
       let info : Lam_tag_info.t = Blk_record s in
       prim ~primitive:(Pmakeblock (tag,info,mutable_flag)) ~args loc    
@@ -277,6 +274,13 @@ let lam_prim ~primitive:( p : Lambda.primitive) ~args loc : Lam.t =
     | Blk_module_export _ -> 
       let info : Lam_tag_info.t = Blk_module_export in
       prim ~primitive:(Pmakeblock (tag,info,mutable_flag)) ~args loc  
+    | Blk_poly_var s -> 
+      begin match args with 
+      | [_; value] -> 
+        let info : Lam_tag_info.t = Blk_poly_var  in
+        prim ~primitive:(Pmakeblock (tag,info,mutable_flag)) ~args:[Lam.const (Const_string s); value] loc      
+      | _ -> assert false  
+      end
     | Blk_lazy_general  
       ->
       begin match args with 

jscomp/core/lam_tag_info.ml

@@ -30,7 +30,7 @@
 type t =   
   | Blk_tuple
   | Blk_array
-  | Blk_poly_var of string 
+  | Blk_poly_var
   | Blk_record of string array 
   | Blk_module of string list
   | Blk_extension