fix CI

Author: bobzhang

jscomp/core/js_of_lam_variant.ml

@@ -32,27 +32,25 @@ type arg_expression =
 
 (* we need destruct [undefined] when input is optional *)
 let eval (arg : J.expression) (dispatches : (Ast_compatible.hash_label * string) list option) : E.t =
-  if arg == E.undefined then E.undefined else
-  match arg.expression_desc with
-  | Str (_,s) ->     
-    let s = match dispatches with 
-    | None -> s 
-    | Some dispatches ->
-      (Ext_list.assoc_by_string  dispatches s None) in 
-    E.str s 
-  | _ -> 
-    match dispatches with 
-    | None -> 
-      E.poly_var_tag_access arg
-    | Some dispatches ->
-      E.of_block
-        [(S.string_switch arg
-            (Ext_list.map dispatches (fun (i,r) ->
-                 {J.switch_case = i ;
-                  switch_body = [S.return_stmt (E.str r)];
-                  should_break = false; (* FIXME: if true, still print break*)
-                  comment = None;
-                 })))]
+  match dispatches with 
+  | None -> arg 
+  | Some dispatches -> 
+    if arg == E.undefined then E.undefined 
+    else
+      match arg.expression_desc with
+      | Str (_,s) ->     
+        let s = 
+          (Ext_list.assoc_by_string  dispatches s None) in 
+        E.str s 
+      | _ -> 
+        E.of_block
+          [(S.string_switch arg
+              (Ext_list.map dispatches (fun (i,r) ->
+                   {J.switch_case = i ;
+                    switch_body = [S.return_stmt (E.str r)];
+                    should_break = false; (* FIXME: if true, still print break*)
+                    comment = None;
+                   })))]
 
 (** invariant: optional is not allowed in this case *)
 (** arg is a polyvar *)

jscomp/test/gpr_2503_test.js

@@ -22,15 +22,15 @@ function b(loc, b$1) {
 function makeWrapper(foo, param) {
   var tmp = {};
   if (foo !== undefined) {
-    tmp.foo = Caml_option.valFromOption(foo).NAME;
+    tmp.foo = Caml_option.valFromOption(foo);
   }
   console.log(tmp);
 
 }
 
 function makeWrapper2(foo, param) {
   console.log({
-        foo: foo.NAME
+        foo: foo
       });
 
 }
@@ -41,7 +41,7 @@ function makeWrapper3(foo, param) {
   console.log(2);
   var tmp = {};
   if (foo !== undefined) {
-    tmp.foo = Caml_option.valFromOption(foo).NAME;
+    tmp.foo = Caml_option.valFromOption(foo);
   }
   return tmp;
 }
@@ -53,7 +53,7 @@ function makeWrapper4(foo, param) {
       foo > 10 ? "b" : "a"
     );
   if (tmp$1 !== undefined) {
-    tmp.foo = Caml_option.valFromOption(tmp$1).NAME;
+    tmp.foo = Caml_option.valFromOption(tmp$1);
   }
   return tmp;
 }