From: Andrea Corallo <akrl@sdf.org>
Date: Thu, 6 May 2021 08:14:00 +0000 (+0200)
Subject: Rename comp-debug -> native-comp-debug
X-Git-Tag: emacs-28.0.90~2580
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=94c69eb1d7dfbe5a6a792c707de0bffe6cd11e28;p=emacs.git

Rename comp-debug -> native-comp-debug

* src/comp.c (emit_ctxt_code, syms_of_comp): Rename comp-debug ->
native-comp-debug.
* lisp/emacs-lisp/comp.el (native-comp-debug, comp-ctxt)
(comp-spill-lap-function, comp-run-async-workers): Likewise.
* lisp/emacs-lisp/bytecomp.el (byte-compile-from-buffer): Likewise.
* test/src/comp-tests.el (comp-tests-bootstrap): Likewise.
---

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 2a07ea79f56..16740e92d35 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2240,8 +2240,8 @@ With argument ARG, insert value in current buffer after the form."
         (when byte-native-compiling
           (defvar native-comp-speed)
           (push `(native-comp-speed . ,native-comp-speed) byte-native-qualities)
-          (defvar comp-debug)
-          (push `(comp-debug . ,comp-debug) byte-native-qualities)
+          (defvar native-comp-debug)
+          (push `(native-comp-debug . ,native-comp-debug) byte-native-qualities)
           (defvar comp-native-driver-options)
           (push `(comp-native-driver-options . ,comp-native-driver-options)
                 byte-native-qualities)
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index d02c3b0c23b..4a8fee01c5d 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -55,7 +55,7 @@
   :safe #'integerp
   :version "28.1")
 
-(defcustom comp-debug (if (eq 'windows-nt system-type) 1 0)
+(defcustom native-comp-debug (if (eq 'windows-nt system-type) 1 0)
   "Debug level for native compilation, a number between 0 and 3.
 This is intended for debugging the compiler itself.
   0 no debug output.
@@ -745,7 +745,7 @@ Returns ELT."
           :documentation "Target output file-name for the compilation.")
   (speed native-comp-speed :type number
          :documentation "Default speed for this compilation unit.")
-  (debug comp-debug :type number
+  (debug native-comp-debug :type number
          :documentation "Default debug level for this compilation unit.")
   (driver-options comp-native-driver-options :type list
          :documentation "Options for the GCC driver.")
@@ -1336,7 +1336,7 @@ clashes."
                                           (car (last comp-eln-load-path))))))
   (setf (comp-ctxt-speed comp-ctxt) (alist-get 'native-comp-speed
                                                byte-native-qualities)
-        (comp-ctxt-debug comp-ctxt) (alist-get 'comp-debug
+        (comp-ctxt-debug comp-ctxt) (alist-get 'native-comp-debug
                                                byte-native-qualities)
         (comp-ctxt-driver-options comp-ctxt) (alist-get 'comp-native-driver-options
                                                         byte-native-qualities)
@@ -3906,7 +3906,7 @@ display a message."
                            ,(when (boundp 'backtrace-line-length)
                               `(setf backtrace-line-length ,backtrace-line-length))
                            (setf native-comp-speed ,native-comp-speed
-                                 comp-debug ,comp-debug
+                                 native-comp-debug ,native-comp-debug
                                  comp-verbose ,comp-verbose
                                  comp-libgccjit-reproducer ,comp-libgccjit-reproducer
                                  comp-async-compilation t
diff --git a/src/comp.c b/src/comp.c
index c87a3e66661..3608167cad1 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -2746,7 +2746,7 @@ emit_ctxt_code (void)
   /* Emit optimize qualities.  */
   Lisp_Object opt_qly[] =
     { Fcons (Qnative_comp_speed, make_fixnum (comp.speed)),
-      Fcons (Qcomp_debug, make_fixnum (comp.debug)),
+      Fcons (Qnative_comp_debug, make_fixnum (comp.debug)),
       Fcons (Qgccjit,
 	     Fcomp_libgccjit_version ()) };
   emit_static_object (TEXT_OPTIM_QLY_SYM, Flist (ARRAYELTS (opt_qly), opt_qly));
@@ -5208,7 +5208,7 @@ compiled one.  */);
   comp_deferred_compilation = true;
 
   DEFSYM (Qnative_comp_speed, "native-comp-speed");
-  DEFSYM (Qcomp_debug, "comp-debug");
+  DEFSYM (Qnative_comp_debug, "native-comp-debug");
   DEFSYM (Qcomp_native_driver_options, "comp-native-driver-options");
   DEFSYM (Qcomp_libgccjit_reproducer, "comp-libgccjit-reproducer");
 
diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index 9e9097c994a..be02c30a752 100644
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -59,7 +59,7 @@ Check that the resulting binaries do not differ."
          (comp1-src (make-temp-file "stage1-" nil ".el"))
          (comp2-src (make-temp-file "stage2-" nil ".el"))
          ;; Can't use debug symbols.
-         (comp-debug 0))
+         (native-comp-debug 0))
     (copy-file comp-src comp1-src t)
     (copy-file comp-src comp2-src t)
     (let ((load-no-native t))