From 63cb2c0e03147d8554ee27d5538ca8168dc6197c Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 5 Jul 2024 22:00:08 +0300
Subject: [PATCH] Improve warnings from native compiler

* src/comp.c (syms_of_comp) <native-compiler>: Rename from 'comp'.

* src/lread.c (maybe_swap_for_eln):
* lisp/emacs-lisp/comp.el (comp--fwprop):
* lisp/emacs-lisp/comp-run.el
(comp--accept-and-process-async-output, native--compile-async):
Adjust to the new symbol.

(cherry picked from commit 814710067f0558e308c7020b22e455fe0ece7878)
---
 lisp/emacs-lisp/comp-run.el | 6 +++---
 lisp/emacs-lisp/comp.el     | 2 +-
 src/comp.c                  | 2 +-
 src/lread.c                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lisp/emacs-lisp/comp-run.el b/lisp/emacs-lisp/comp-run.el
index 8e08eca7442..17a9ab71f7e 100644
--- a/lisp/emacs-lisp/comp-run.el
+++ b/lisp/emacs-lisp/comp-run.el
@@ -195,7 +195,7 @@ processes from `comp-async-compilations'"
   (if native-comp-async-report-warnings-errors
       (let ((warning-suppress-types
              (if (eq native-comp-async-report-warnings-errors 'silent)
-                 (cons '(comp) warning-suppress-types)
+                 (cons '(native-compiler) warning-suppress-types)
                warning-suppress-types))
             (regexp (if (eq native-comp-async-warnings-errors-kind 'all)
                         "^.*?\\(?:Error\\|Warning\\): .*$"
@@ -211,7 +211,7 @@ processes from `comp-async-compilations'"
             (accept-process-output process)
             (goto-char (or comp-last-scanned-async-output (point-min)))
             (while (re-search-forward regexp nil t)
-              (display-warning 'comp (match-string 0)))
+              (display-warning 'native-compiler (match-string 0)))
             (setq comp-last-scanned-async-output (point-max)))))
     (accept-process-output process)))
 
@@ -446,7 +446,7 @@ bytecode definition was not changed in the meantime)."
                 (setf comp-files-queue
                       (append comp-files-queue `((,file . ,load)))
                       added-something t)
-              (display-warning 'comp
+              (display-warning 'native-compiler
                                (format "No write access for %s skipping."
                                        out-filename)))))))
     ;; Perhaps nothing passed `native--compile-async-skip-p'?
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 6c56fd78859..2844e89c661 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2792,7 +2792,7 @@ Return t if something was changed."
                   finally
                   (when (= i 100)
                     (display-warning
-                     'comp
+                     'native-compiler
                      (format "fwprop pass jammed into %s?" (comp-func-name f))))
                   (comp-log (format "Propagation run %d times\n" i) 2))
                  (comp--rewrite-non-locals)
diff --git a/src/comp.c b/src/comp.c
index df7fa3a5199..3b372145d07 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -5756,7 +5756,7 @@ natively-compiled one.  */);
   DEFSYM (Qd_ephemeral, "d-ephemeral");
 
   /* Others.  */
-  DEFSYM (Qcomp, "comp");
+  DEFSYM (Qnative_compiler, "native-compiler");
   DEFSYM (Qfixnum, "fixnum");
   DEFSYM (Qscratch, "scratch");
   DEFSYM (Qlate, "late");
diff --git a/src/lread.c b/src/lread.c
index 047a201eaaa..c3b0e8a3ef5 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1883,7 +1883,7 @@ maybe_swap_for_eln (bool no_native, Lisp_Object *filename, int *fd,
 		return;
 	      Vdelayed_warnings_list
 		= Fcons (list2
-			 (Qcomp,
+			 (Qnative_compiler,
 			  CALLN (Fformat,
 				 build_string ("Cannot look up .eln file "
 					       "for %s because no source "
-- 
2.39.2