fix rebase

Author: Ekdohibs

middle_end/flambda2/from_lambda/closure_conversion.ml

@@ -2099,7 +2099,7 @@ let wrap_partial_application acc env apply_continuation (apply : IR.apply)
         ~return:apply.return_arity ~return_continuation ~exn_continuation
         ~my_region:apply.region ~body:fbody ~attr ~loc:apply.loc
         ~free_idents_of_body ~closure_alloc_mode
-        ~num_trailing_complex_local_params ~contains_no_escaping_local_allocs
+        ~first_complex_local_param ~contains_no_escaping_local_allocs
         Recursive.Non_recursive ]
   in
   let body acc env =

middle_end/flambda2/to_cmm/to_cmm_set_of_closures.ml

@@ -60,7 +60,7 @@ let get_func_decl_params_arity t code_id =
     then Lambda.Tupled
     else
       let nlocal =
-        Flambda_arity.cardinal (Code_metadata.params_arity info)
+        Flambda_arity.num_params (Code_metadata.params_arity info)
         - Code_metadata.first_complex_local_param info
       in
       Lambda.Curried { nlocal }