Handle getters/setters and restore removed test

Author: cristianoc

jscomp/core/lam_compile.ml

@@ -1531,15 +1531,10 @@ and compile_prim (prim_info : Lam.prim_info)
          check the arity of fn before wrapping it
          we need mark something that such eta-conversion can not be simplified in some cases
       *)
-  | {
-   primitive = Pjs_unsafe_downgrade { name = property; setter };
-   args = [ obj ];
-  } -> (
-      (*
-       either a getter {[ x #. height ]} or {[ x ## method_call ]}
-    *)
-      (* assert (not setter); *)
-
+  | { primitive = Pjs_unsafe_downgrade { name = property; setter=false };
+      args = [ obj ];
+    } -> (
+      (* getter {[ x #. height ]} *)
       match
         compile_lambda { lambda_cxt with continuation = NeedValue Not_tail } obj
       with
@@ -1555,18 +1550,10 @@ and compile_prim (prim_info : Lam.prim_info)
           in
           Js_output.output_of_block_and_expression lambda_cxt.continuation
             blocks ret)
-  | {
-   primitive = Pfull_apply;
-   args =
-     [
-       Lprim
-         {
-           primitive = Pjs_unsafe_downgrade { name = property; setter = true };
-           args = [ obj ];
-         };
-       setter_val;
-     ];
-  } -> (
+  | { primitive = Pjs_unsafe_downgrade { name = property; setter = true };
+      args = [ obj; setter_val ];
+    }  -> (
+      (* setter {[ x ## method_call ]} *)
       let need_value_no_return_cxt =
         { lambda_cxt with continuation = NeedValue Not_tail }
       in
@@ -1589,10 +1576,7 @@ and compile_prim (prim_info : Lam.prim_info)
           | Some (obj_code, obj) ->
               cont obj_block arg_block (Some obj_code)
                 (E.seq (E.assign (E.dot (E.var obj) property) value) E.unit)))
-  | {
-   primitive = Pfull_apply;
-   args = Lprim { primitive = Pjs_unsafe_downgrade { setter = true } } :: _;
-  } ->
+  | { primitive = Pjs_unsafe_downgrade _; args } ->
       assert false
   | { primitive = Pfull_apply | Pvoid_run; args; loc } -> (
       (* 1. uncurried call should not do eta-conversion

jscomp/core/lam_convert.ml

@@ -527,6 +527,24 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) :
     match lam with
     | Lvar x -> Lam.var (Hash_ident.find_default alias_tbl x x)
     | Lconst x -> Lam.const (Lam_constant_convert.convert_constant x)
+    | Lapply { ap_func = ((Lsend (name, obj, loc))); ap_args } when Ext_string.ends_with name Literals.setter_suffix ->
+      let obj = convert_aux obj in
+      let args = obj :: (Ext_list.map ap_args convert_aux) in
+      let property =
+          (String.sub name 0
+              (String.length name - Literals.setter_suffix_len))
+      in
+      prim
+        ~primitive:(Pjs_unsafe_downgrade { name = property; setter=true })
+        ~args loc
+    | Lsend (name, obj, loc) ->
+        let obj = convert_aux obj in
+        let args = [ obj ] in
+        let setter = Ext_string.ends_with name Literals.setter_suffix in
+        let _ = assert (not setter) in
+        prim
+          ~primitive:(Pjs_unsafe_downgrade { name; setter })
+          ~args loc
     | Lapply { ap_func = fn; ap_args = args; ap_loc = loc; ap_inlined } ->
         (* we need do this eargly in case [aux fn] add some wrapper *)
         Lam.apply (convert_aux fn)
@@ -611,19 +629,6 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) :
     | Lfor (id, from_, to_, dir, loop) ->
         Lam.for_ id (convert_aux from_) (convert_aux to_) dir (convert_aux loop)
     | Lassign (id, body) -> Lam.assign id (convert_aux body)
-    | Lsend (name, obj, loc) ->
-        let obj = convert_aux obj in
-        let args = [ obj ] in
-        let setter = Ext_string.ends_with name Literals.setter_suffix in
-        let property =
-          if setter then
-            (String.sub name 0
-                (String.length name - Literals.setter_suffix_len))
-          else name
-        in
-        prim
-          ~primitive:(Pjs_unsafe_downgrade { name = property; setter })
-          ~args loc
   and convert_let (kind : Lam_compat.let_kind) id (e : Lambda.lambda) body :
       Lam.t =
     match (kind, e) with