use tagged_template annotation in ffi instead

Author: tsnobip

jscomp/core/lam.ml

@@ -28,7 +28,6 @@ type apply_status = App_na | App_infer_full | App_uncurry
 type ap_info = {
   ap_loc : Location.t;
   ap_inlined : Lambda.inline_attribute;
-  ap_tagged_template : bool;
   ap_status : apply_status;
 }
 

jscomp/core/lam.mli

@@ -27,7 +27,6 @@ type apply_status = App_na | App_infer_full | App_uncurry
 type ap_info = {
   ap_loc : Location.t;
   ap_inlined : Lambda.inline_attribute;
-  ap_tagged_template : bool;
   ap_status : apply_status;
 }
 

jscomp/core/lam_analysis.ml

@@ -98,7 +98,7 @@ let rec no_side_effects (lam : Lam.t) : bool =
           true
       | Pjs_apply | Pjs_runtime_apply | Pjs_call _ | Pinit_mod | Pupdate_mod
       | Pjs_unsafe_downgrade _ | Pdebugger | Pvoid_run | Pfull_apply
-      | Pjs_fn_method  | Pjs_tagged_template _
+      | Pjs_fn_method
       (* TODO *)
       | Praw_js_code _ | Pbytessetu | Pbytessets
       (* Operations on boxed integers (Nativeint.t, Int32.t, Int64.t) *)

jscomp/core/lam_compile.ml

@@ -1599,7 +1599,6 @@ and compile_prim (prim_info : Lam.prim_info)
                {
                  ap_loc = loc;
                  ap_inlined = Default_inline;
-                 ap_tagged_template = false;
                  ap_status = App_uncurry;
                })
       (*FIXME: should pass info down: `f a [@bs][@inlined]`*)

jscomp/core/lam_compile_external_call.ml

@@ -252,7 +252,17 @@ let translate_scoped_access scopes obj =
 let translate_ffi (cxt : Lam_compile_context.t) arg_types
     (ffi : External_ffi_types.external_spec) (args : J.expression list) =
   match ffi with
-  | Js_call { external_module_name = module_name; name = fn; splice; scopes } ->
+  | Js_call { external_module_name; name; splice; scopes; tagged_template = true } -> 
+      let fn = translate_scoped_module_val external_module_name name scopes in 
+      (match args with
+      | [ stringArgs; valueArgs ] -> (
+          match (stringArgs, valueArgs) with
+          | ({expression_desc = Array (strings, _); _}, {expression_desc = Array (values, _); _}) ->
+              E.tagged_template fn strings values
+          | _ -> assert false
+          )
+      | _ -> assert false)
+  | Js_call { external_module_name = module_name; name = fn; splice; scopes; tagged_template = false } ->
       let fn = translate_scoped_module_val module_name fn scopes in
       if splice then
         let args, eff, dynamic = assemble_args_has_splice arg_types args in
@@ -381,19 +391,3 @@ let translate_ffi (cxt : Lam_compile_context.t) arg_types
       | [ obj; v; value ] ->
           Js_arr.set_array (translate_scoped_access scopes obj) v value
       | _ -> assert false)
-
-let translate_tagged_template (cxt : Lam_compile_context.t)
-  (ffi : External_ffi_types.external_spec) (args : J.expression list) = 
-  let fn = match ffi with
-  | Js_call { external_module_name; name; scopes; _ } ->
-      translate_scoped_module_val external_module_name name scopes
-  | _ ->  assert false
-  in
-  match args with
-  | [ stringArgs; valueArgs ] -> (
-      match (stringArgs, valueArgs) with
-      | ({expression_desc = Array (strings, _); _}, {expression_desc = Array (values, _); _}) ->
-          E.tagged_template fn strings values
-      | _ -> assert false
-      )
-  | _ -> assert false

jscomp/core/lam_compile_external_call.mli

@@ -36,12 +36,6 @@ val translate_ffi :
   J.expression list ->
   J.expression
 
-val translate_tagged_template :
-  Lam_compile_context.t ->
-  External_ffi_types.external_spec ->
-  J.expression list ->
-  J.expression
-
 (** TODO: document supported attributes
     Attributes starting with `js` are reserved
     examples: "variadic"

jscomp/core/lam_compile_primitive.ml

@@ -339,7 +339,6 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
   | Pjs_object_create _ -> assert false
   | Pjs_call { arg_types; ffi } ->
       Lam_compile_external_call.translate_ffi cxt arg_types ffi args
-  | Pjs_tagged_template { ffi } -> Lam_compile_external_call.translate_tagged_template cxt ffi args
   (* FIXME, this can be removed later *)
   | Pisint -> E.is_type_number (Ext_list.singleton_exn args)
   | Pis_poly_var_block -> E.is_type_object (Ext_list.singleton_exn args)

jscomp/core/lam_convert.ml

@@ -512,11 +512,11 @@ 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 = fn; ap_args = args; ap_loc = loc; ap_inlined; ap_tagged_template } ->
+    | 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)
           (Ext_list.map args convert_aux)
-          { ap_loc = loc; ap_inlined; ap_tagged_template; ap_status = App_na }
+          { ap_loc = loc; ap_inlined; ap_status = App_na }
     | Lfunction { params; body; attr } ->
         let new_map, body =
           rename_optional_parameters Map_ident.empty params body
@@ -685,15 +685,13 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) :
           {
             ap_loc = outer_loc;
             ap_inlined = ap_info.ap_inlined;
-            ap_tagged_template = ap_info.ap_tagged_template;
             ap_status = App_na;
           }
     | _ ->
         Lam.apply f [ x ]
           {
             ap_loc = outer_loc;
             ap_inlined = Default_inline;
-            ap_tagged_template = false;
             ap_status = App_na;
           }
   and convert_switch (e : Lambda.lambda) (s : Lambda.lambda_switch) =

jscomp/core/lam_eta_conversion.ml

@@ -111,7 +111,7 @@ let transform_under_supply n ap_info fn args =
 let unsafe_adjust_to_arity loc ~(to_ : int) ?(from : int option) (fn : Lam.t) :
     Lam.t =
   let ap_info : Lam.ap_info =
-    { ap_loc = loc; ap_inlined = Default_inline; ap_tagged_template = false; ap_status = App_na }
+    { ap_loc = loc; ap_inlined = Default_inline; ap_status = App_na }
   in
   let is_async_fn = match fn with
     | Lfunction { attr = {async}} -> async 

jscomp/core/lam_pass_remove_alias.ml

@@ -198,7 +198,7 @@ let simplify_alias (meta : Lam_stats.t) (lam : Lam.t) : Lam.t =
 
         (* Ext_log.dwarn __LOC__ "%s/%d" v.name v.stamp;     *)
         let ap_args = Ext_list.map ap_args simpl in
-        let normal () = Lam.apply (simpl fn) ap_args ap_info in
+        let[@local] normal () = Lam.apply (simpl fn) ap_args ap_info in
         match Hash_ident.find_opt meta.ident_tbl v with
         | Some
             (FunctionId
@@ -238,7 +238,7 @@ let simplify_alias (meta : Lam_stats.t) (lam : Lam.t) : Lam.t =
                   Lam_closure.is_closed_with_map meta.export_idents params body
                 in
                 let is_export_id = Set_ident.mem meta.export_idents v in
-                let result = match (is_export_id, param_map) with
+                match (is_export_id, param_map) with
                 | false, (_, param_map) | true, (true, param_map) -> (
                     match rec_flag with
                     | Lam_rec ->
@@ -256,18 +256,6 @@ let simplify_alias (meta : Lam_stats.t) (lam : Lam.t) : Lam.t =
                             (Lam_beta_reduce.propagate_beta_reduce_with_map meta
                                param_map params body ap_args))
                 | _ -> normal ()
-                in
-                let result = (match result with
-                | Lprim {primitive; args; loc} -> (match primitive with
-                  (* Converts Pjs_calls to Pjs_tagged_templates if ap_tagged_template is true *)
-                  | Pjs_call {prim_name; ffi} when ap_info.ap_tagged_template ->
-                    let prim = Lam_primitive.Pjs_tagged_template {prim_name; ffi} in
-                    Lam.prim ~primitive:prim ~args loc
-                  | _ -> result
-                  )
-                | _ -> result)
-                in
-                result
               else normal ()
             else normal ()
         | Some _ | None -> normal ())