prototype of optimization on external obj

Author: bobzhang

jscomp/core/lam_compile_external_obj.ml

@@ -104,7 +104,7 @@ let assemble_obj_args (labels : External_arg_spec.obj_params)  (args : J.express
       (Ext_list.flat_map assignment (fun 
         ((xlabel : External_arg_spec.obj_param), (arg  : J.expression )) -> 
       match xlabel with 
-      | {obj_arg_label = Obj_optional {name = label} } -> 
+      | {obj_arg_label = Obj_optional {name = label;for_sure_no_nested_option} } -> 
         (* Need make sure whether assignment is effectful or not
           to avoid code duplication
         *)
@@ -114,7 +114,7 @@ let assemble_obj_args (labels : External_arg_spec.obj_params)  (args : J.express
             Lam_compile_external_call.ocaml_to_js_eff 
             ~arg_label:
              Arg_empty ~arg_type:xlabel.obj_arg_type 
-              (Js_of_lam_option.val_from_option arg) in 
+              (if for_sure_no_nested_option then arg else Js_of_lam_option.val_from_option arg) in 
           begin match acc with 
           | Splice1 v  ->                         
             [S.if_ (Js_of_lam_option.is_not_none arg )

jscomp/frontend/ast_external_process.ml

@@ -492,17 +492,21 @@ let process_obj
                    param_type::arg_types, result_types
                  | Nothing ->
                    let s = (Lam_methname.translate  name) in
-                   {obj_arg_label = External_arg_spec.optional s; obj_arg_type},
+                   let not_nested = 
+                      match ty.ptyp_desc with 
+                      | Ptyp_constr({txt = Lident ("unit" | "string");_}, []) -> true
+                      | _ -> false in 
+                   {obj_arg_label = External_arg_spec.optional not_nested s; obj_arg_type},
                    param_type :: arg_types,
                    ( Parsetree.Otag ({Asttypes.txt = name; loc}, [], Ast_comb.to_undefined_type loc ty) ::  result_types)
                  | Int _  ->
                    let s = Lam_methname.translate  name in
-                   {obj_arg_label = External_arg_spec.optional s ; obj_arg_type },
+                   {obj_arg_label = External_arg_spec.optional true s ; obj_arg_type },
                    param_type :: arg_types,
                    (Otag ({Asttypes.txt = name; loc}, [], Ast_comb.to_undefined_type loc @@ Ast_literal.type_int ~loc ()) :: result_types)
                  | Poly_var_string _ ->
                    let s = Lam_methname.translate  name in
-                   {obj_arg_label = External_arg_spec.optional s ; obj_arg_type },
+                   {obj_arg_label = External_arg_spec.optional true s ; obj_arg_type },
                    param_type::arg_types,
                    (Otag ({Asttypes.txt = name; loc}, [], Ast_comb.to_undefined_type loc @@ Ast_literal.type_string ~loc ()) :: result_types)
                  | Arg_cst _
@@ -1020,7 +1024,7 @@ let pval_prim_of_option_labels
           let label_name = Lam_methname.translate  p.txt in
           let obj_arg_label =
             if is_option then
-              External_arg_spec.optional label_name
+              External_arg_spec.optional false label_name
             else External_arg_spec.obj_label label_name 
           in
           {obj_arg_type = Nothing ;

jscomp/frontend/external_arg_spec.ml

@@ -35,9 +35,10 @@ type label_noname =
   | Arg_optional
 
 type label = 
-  | Obj_label of {name : string }
+  | Obj_label of {name : string ; }
   | Obj_empty 
-  | Obj_optional of {name : string }
+  | Obj_optional of {name : string; for_sure_no_nested_option : bool }
+
   (* it will be ignored , side effect will be recorded *)
 
 
@@ -90,7 +91,8 @@ let empty_label = Obj_empty
 let obj_label name  = 
     Obj_label {name }
 
-let optional name = Obj_optional {name}
+let optional for_sure_no_nested_option name =
+   Obj_optional {name; for_sure_no_nested_option}
 
 let empty_kind obj_arg_type = { obj_arg_label = empty_label ; obj_arg_type }
 let dummy = 

jscomp/frontend/external_arg_spec.mli

@@ -32,7 +32,8 @@ type label = private
   | Obj_label of {name : string}
   | Obj_empty 
 
-  | Obj_optional of {name : string}
+  | Obj_optional of {name : string;
+    for_sure_no_nested_option : bool}
   (* it will be ignored , side effect will be recorded *)
 
 
@@ -83,6 +84,8 @@ val cst_string : string -> cst
 val empty_label : label
 (* val empty_lit : cst -> label  *)
 val obj_label :  string -> label
-val optional  : string -> label
+val optional  : 
+  bool ->
+  string -> label
 val empty_kind : attr -> obj_param
 val dummy : param

jscomp/main/builtin_cmi_datasets.ml

@@ -1 +1,15 @@
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
+'use strict';
+
+
+function u(lo, hi) {
+  var tmp = {
+    lo: lo
+  };
+  if (hi !== undefined) {
+    tmp.hi = hi;
+  }
+  return tmp;
+}
+
+exports.u = u;
+/* No side effect */

jscomp/test/debug_tmp.js

@@ -1,6 +1,8 @@
 
 [@@@config {
   flags = [|
+  (* "-w";
+  "@A" *)
   (* "-drawlambda"; *)
   (* "-dtypedtree"; *)
   (* "-bs-diagnose"; *)
@@ -9,3 +11,7 @@
   |]
 }]
 
+external f : lo:int -> ?hi:string -> unit -> _ = "" [@@obj]
+
+
+let u lo hi  = f ~lo ?hi ()

jscomp/test/debug_tmp.ml

@@ -52,7 +52,7 @@ function make(foo) {
   return function (param) {
     var tmp = {};
     if (partial_arg !== undefined) {
-      tmp.foo = Caml_option.valFromOption(partial_arg);
+      tmp.foo = partial_arg;
     }
     return tmp;
   };

jscomp/test/gpr_1409_test.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var Caml_option = require("../../lib/js/caml_option.js");
 
 function v(displayName, param) {
   var tmp = {
@@ -9,7 +8,7 @@ function v(displayName, param) {
     hi: "ghos"
   };
   if (displayName !== undefined) {
-    tmp.displayName = Caml_option.valFromOption(displayName);
+    tmp.displayName = displayName;
   }
   return tmp;
 }