make it compile without clambda changes

Author: Ekdohibs

backend/cmm_helpers.ml

@@ -3555,12 +3555,12 @@ let emit_constant_closure ((_, global_symb) as symb) fundecls clos_vars cont =
         | arity ->
           (Cint (infix_header pos) :: closure_symbol f2)
           @ Csymbol_address
-              (curry_function_sym arity.function_kind
-                 (List.map machtype_of_layout arity.params_layout)
-                 (machtype_of_layout arity.return_layout))
+              (curry_function_sym (fst arity)
+                 (List.init (snd arity) (fun _ -> typ_val))
+                 typ_val)
             :: Cint
                  (closure_info
-                    ~arity:(arity.function_kind, List.length arity.params_layout)
+                    ~arity
                     ~startenv:(startenv - pos) ~is_last)
             :: Csymbol_address f2.label
             :: emit_others (pos + 4) rem)
@@ -3577,12 +3577,12 @@ let emit_constant_closure ((_, global_symb) as symb) fundecls clos_vars cont =
       :: emit_others 3 remainder
     | arity ->
       Csymbol_address
-        (curry_function_sym arity.function_kind
-           (List.map machtype_of_layout arity.params_layout)
-           (machtype_of_layout arity.return_layout))
+        (curry_function_sym (fst arity)
+           (List.init (snd arity) (fun _ -> typ_val))
+           typ_val)
       :: Cint
            (closure_info
-              ~arity:(arity.function_kind, List.length arity.params_layout)
+              ~arity
               ~startenv ~is_last)
       :: Csymbol_address f1.label :: emit_others 4 remainder)
 

backend/cmmgen.ml

@@ -465,8 +465,8 @@ let rec transl env e =
                                    ~startenv:(startenv - pos) ~is_last dbg ::
                 transl_fundecls (pos + 3) rem
               | arity ->
-                Cconst_symbol (curry_function_sym arity.function_kind (List.map machtype_of_layout arity.params_layout) (machtype_of_layout arity.return_layout), dbg) ::
-                alloc_closure_info ~arity:(arity.function_kind, List.length arity.params_layout)
+                Cconst_symbol (curry_function_sym (fst arity) (List.init (snd arity) (fun _ -> typ_val)) typ_val, dbg) ::
+                alloc_closure_info ~arity
                                    ~startenv:(startenv - pos) ~is_last dbg ::
                 Cconst_symbol (f.label, dbg) ::
                 transl_fundecls (pos + 4) rem

middle_end/flambda2/to_cmm/to_cmm_set_of_closures.ml

@@ -50,8 +50,8 @@ let get_func_decl_params_arity t code_id =
       Lambda.Curried { nlocal = Code_metadata.num_trailing_local_params info }
   in
   let closure_code_pointers =
-    match kind, num_params with
-    | Curried _, (0 | 1) -> Full_application_only
+    match kind, params_ty with
+    | Curried _, ([] | [_]) -> Full_application_only
     | (Curried _ | Tupled), _ -> Full_and_partial_application
   in
   let arity = kind, params_ty, result_ty in
@@ -157,7 +157,7 @@ end = struct
         get_func_decl_params_arity env code_id
       in
       let closure_info =
-        C.closure_info ~arity ~startenv:(startenv - slot_offset)
+        C.closure_info ~arity:(kind, List.length params_ty) ~startenv:(startenv - slot_offset)
           ~is_last:last_function_slot
       in
       let acc =