Reorder subr register function arguments to make some room

	* src/comp.c (Fcomp__register_lambda, Fcomp__register_subr)
	(Fcomp__late_register_subr): Use a rest arg to pass 'doc_idx' and
	'intspec' parameters.
	* lisp/emacs-lisp/comp.el (comp-emit-for-top-level)
	(comp-emit-lambda-for-top-level): Update.

1 files changed, 14 insertions, 13 deletions

diff --git a/src/comp.c b/src/comp.c
index 52ebf92c500..ee8ae98e2ac 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4925,13 +4925,14 @@ make_subr (Lisp_Object symbol_name, Lisp_Object minarg, Lisp_Object maxarg,
 }
 
 DEFUN ("comp--register-lambda", Fcomp__register_lambda, Scomp__register_lambda,
-       7, 7, 0,
+       6, 6, 0,
        doc: /* Register anonymous lambda.
 This gets called by top_level_run during the load phase.  */)
-  (Lisp_Object reloc_idx, Lisp_Object minarg, Lisp_Object maxarg,
-   Lisp_Object c_name, Lisp_Object doc_idx, Lisp_Object intspec,
-   Lisp_Object comp_u)
+  (Lisp_Object reloc_idx, Lisp_Object c_name, Lisp_Object minarg,
+   Lisp_Object maxarg, Lisp_Object rest, Lisp_Object comp_u)
 {
+  Lisp_Object doc_idx = FIRST (rest);
+  Lisp_Object intspec = SECOND (rest);
   struct Lisp_Native_Comp_Unit *cu = XNATIVE_COMP_UNIT (comp_u);
   if (cu->loaded_once)
     return Qnil;
@@ -4953,13 +4954,14 @@ This gets called by top_level_run during the load phase.  */)
 }
 
 DEFUN ("comp--register-subr", Fcomp__register_subr, Scomp__register_subr,
-       7, 7, 0,
+       6, 6, 0,
        doc: /* Register exported subr.
 This gets called by top_level_run during the load phase.  */)
-  (Lisp_Object name, Lisp_Object minarg, Lisp_Object maxarg,
-   Lisp_Object c_name, Lisp_Object doc_idx, Lisp_Object intspec,
-   Lisp_Object comp_u)
+  (Lisp_Object name, Lisp_Object c_name, Lisp_Object minarg,
+   Lisp_Object maxarg, Lisp_Object rest, Lisp_Object comp_u)
 {
+  Lisp_Object doc_idx = FIRST (rest);
+  Lisp_Object intspec = SECOND (rest);
   Lisp_Object tem =
     make_subr (SYMBOL_NAME (name), minarg, maxarg, c_name, doc_idx, intspec,
                comp_u);
@@ -4982,16 +4984,15 @@ This gets called by top_level_run during the load phase.  */)
 }
 
 DEFUN ("comp--late-register-subr", Fcomp__late_register_subr,
-       Scomp__late_register_subr, 7, 7, 0,
+       Scomp__late_register_subr, 6, 6, 0,
        doc: /* Register exported subr.
 This gets called by late_top_level_run during the load phase.  */)
-  (Lisp_Object name, Lisp_Object minarg, Lisp_Object maxarg,
-   Lisp_Object c_name, Lisp_Object doc, Lisp_Object intspec,
-   Lisp_Object comp_u)
+  (Lisp_Object name, Lisp_Object c_name, Lisp_Object minarg,
+   Lisp_Object maxarg, Lisp_Object rest, Lisp_Object comp_u)
 {
   if (!NILP (Fequal (Fsymbol_function (name),
                      Fgethash (name, Vcomp_deferred_pending_h, Qnil))))
-    Fcomp__register_subr (name, minarg, maxarg, c_name, doc, intspec, comp_u);
+    Fcomp__register_subr (name, c_name, minarg, maxarg, type, rest, comp_u);
   Fremhash (name, Vcomp_deferred_pending_h);
   return Qnil;
 }