From bdcd8dd9fe4a9926a0dbc46ee1180ef53a91bf17 Mon Sep 17 00:00:00 2001
From: Andrea Corallo <andrea_corallo@yahoo.it>
Date: Fri, 16 Aug 2019 15:48:38 +0200
Subject: [PATCH] some other renaming

---
 lisp/emacs-lisp/comp.el | 10 +++++-----
 src/comp.c              |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 1c2ac4c6e4a..80b71590ec4 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -76,16 +76,16 @@
 	     finally return h)
     "Hash table lap-op -> stack adjustment."))
 
-(cl-defstruct comp-args-gen
+(cl-defstruct comp-args-base
   (min nil :type number
        :documentation "Minimum number of arguments allowed."))
 
-(cl-defstruct (comp-args (:include comp-args-gen))
+(cl-defstruct (comp-args (:include comp-args-base))
   (max nil :type number
        :documentation "Maximum number of arguments allowed.
 To be used when ncall-conv is nil."))
 
-(cl-defstruct (comp-nargs (:include comp-args-gen))
+(cl-defstruct (comp-nargs (:include comp-args-base))
   "Describe args when the functin signature is of kind:
 (ptrdiff_t nargs, Lisp_Object *args)."
   (nonrest nil :type number
@@ -114,7 +114,7 @@ into it.")
              :documentation "Byte compiled version.")
   (lap () :type list
        :documentation "Lap assembly representation.")
-  (args nil :type 'comp-args-gen)
+  (args nil :type 'comp-args-base)
   (frame-size nil :type 'number)
   (blocks (make-hash-table) :type 'hash-table
           :documentation "Key is the basic block symbol value is a comp-block
@@ -767,7 +767,7 @@ the annotation emission."
                      :sp -1
                      :frame (comp-new-frame frame-size)))
          (args (comp-func-args func))
-         (args-min (comp-args-gen-min args))
+         (args-min (comp-args-base-min args))
          (comp-block ()))
     ;; Prologue
     (comp-emit-block 'entry)
diff --git a/src/comp.c b/src/comp.c
index 95bfb5d561b..1e1060fd878 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -2651,7 +2651,7 @@ DEFUN ("comp-compile-and-load-ctxt", Fcomp_compile_and_load_ctxt,
       x->s.header.size = PVEC_SUBR << PSEUDOVECTOR_AREA_BITS;
       x->s.function.a0 = gcc_jit_result_get_code(gcc_res, c_name);
       eassert (x->s.function.a0);
-      x->s.min_args = XFIXNUM (FUNCALL1 (comp-args-gen-min, args));
+      x->s.min_args = XFIXNUM (FUNCALL1 (comp-args-base-min, args));
       if (FUNCALL1 (comp-args-p, args))
 	x->s.max_args = XFIXNUM (FUNCALL1 (comp-args-max, args));
       else
-- 
2.39.5