[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on st
From: |
Lars Ingebrigtsen |
Subject: |
bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup |
Date: |
Sun, 16 Oct 2022 10:21:47 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
Stefan Monnier <monnier@iro.umontreal.ca> writes:
> Re-reading this discussion what I see is two different options, neither
> of which is significantly better than the other.
> So the motivation to change is not very high.
True.
So I've now implemented Stefan's suggestion (i.e., just putting a
puthash into the .elc file if the file-local variable says so), and it
seems to work fine.
Andrea, does this look OK to you?
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 74ba8984f2..1dc5442716 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2323,9 +2323,15 @@ byte-compile-from-buffer
(setq case-fold-search nil))
(displaying-byte-compile-warnings
(with-current-buffer inbuffer
- (and byte-compile-current-file
- (byte-compile-insert-header byte-compile-current-file
- byte-compile--outbuffer))
+ (when byte-compile-current-file
+ (byte-compile-insert-header byte-compile-current-file
+ byte-compile--outbuffer)
+ ;; Instruct native-comp to ignore this file.
+ (when (bound-and-true-p no-native-compile)
+ (with-current-buffer byte-compile--outbuffer
+ (insert
+ "(when (boundp 'native-comp--no-native-compile)
+ (puthash load-file-name t native-comp--no-native-compile))\n\n"))))
(goto-char (point-min))
;; Should we always do this? When calling multiple files, it
;; would be useful to delay this warning until all have been
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 889bffa3f5..3c64f472a0 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -4119,6 +4119,8 @@ native-compile-async-skip-p
LOAD and SELECTOR work as described in `native--compile-async'."
;; Make sure we are not already compiling `file' (bug#40838).
(or (gethash file comp-async-compilations)
+ (gethash (file-name-with-extension file "elc")
+ native-comp--no-native-compile)
(cond
((null selector) nil)
((functionp selector) (not (funcall selector file)))
diff --git a/lisp/loadup.el b/lisp/loadup.el
index c01c827a75..95bfbc502e 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -501,7 +501,10 @@
bin-dest-dir)
;; Relative filename from the built uninstalled binary.
(file-relative-name file invocation-directory)))))
- comp-loaded-comp-units-h))))
+ comp-loaded-comp-units-h)))
+ ;; Set up the mechanism to allow inhibiting native-comp via
+ ;; file-local variables.
+ (defvar native-comp--no-native-compile (make-hash-table :test #'equal)))
(when (hash-table-p purify-flag)
(let ((strings 0)
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Lars Ingebrigtsen, 2022/10/14
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Stefan Monnier, 2022/10/14
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Lars Ingebrigtsen, 2022/10/15
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Stefan Monnier, 2022/10/15
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup,
Lars Ingebrigtsen <=
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Andrea Corallo, 2022/10/17
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Lars Ingebrigtsen, 2022/10/17
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Andrea Corallo, 2022/10/17
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Eli Zaretskii, 2022/10/17
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Lars Ingebrigtsen, 2022/10/17
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Arash Esbati, 2022/10/17
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Lars Ingebrigtsen, 2022/10/17
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Arash Esbati, 2022/10/17
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Lars Ingebrigtsen, 2022/10/17
- bug#57627: 29.0.50; [native-compilation] cl-loaddefs.el recompiled on startup, Lars Ingebrigtsen, 2022/10/17