update upstream changes, precise Field info

bobzhang · bobzhang · commit 1fa42b859102 · 2020-05-20T16:26:03.000+08:00
diff --git a/jscomp/core/js_of_lam_block.ml b/jscomp/core/js_of_lam_block.ml
@@ -56,6 +56,7 @@ let field (field_info : Lam_compat.field_dbg_info) e i =
   | Fld_poly_var_content 
   | Fld_record_inline _
   | Fld_variant
+  | Fld_array
     -> 
     E.array_index_by_int  
       ?comment:(Lam_compat.str_of_field_info field_info) e i 
diff --git a/jscomp/core/lam_compat.ml b/jscomp/core/lam_compat.ml
@@ -171,10 +171,11 @@ type field_dbg_info = Lambda.field_dbg_info =
   | Fld_poly_var_content
   | Fld_extension
   | Fld_variant
-
+  | Fld_array 
 let str_of_field_info (x : field_dbg_info) : string option =  
   match x with 
-  | Fld_na  s -> Some s
+  | Fld_na  s -> if s = "" then None else Some s
+  | Fld_array
   | Fld_extension
   | Fld_variant
   | Fld_poly_var_tag 
diff --git a/jscomp/core/lam_compat.mli b/jscomp/core/lam_compat.mli
@@ -80,6 +80,7 @@ type field_dbg_info = Lambda.field_dbg_info =
   | Fld_poly_var_content
   | Fld_extension 
   | Fld_variant
+  | Fld_array
   
 val str_of_field_info : 
   field_dbg_info -> 
diff --git a/ocaml b/ocaml
@@ -1 +1 @@
-Subproject commit a020fc60a07d29904455bfa696136335613c9de7
+Subproject commit a410ff7266b91ea6e3af2c049618dca162ffac13
