diff options
| author | Jens Schmidt <jschmidt4gnu@vodafonemail.de> | 2023-11-20 23:42:01 +0100 |
|---|---|---|
| committer | Andrea Corallo <acorallo@gnu.org> | 2023-12-04 21:43:31 +0100 |
| commit | e670412a3e101e70dc26e021f467faece8cb7f6b (patch) | |
| tree | ee437a40654aae105241cfdaf3cc31330c22e65f /lisp/emacs-lisp | |
| parent | f5e45247081ab2489581c650423413a2b6c2caf9 (diff) | |
| download | emacs-e670412a3e101e70dc26e021f467faece8cb7f6b.tar.gz emacs-e670412a3e101e70dc26e021f467faece8cb7f6b.tar.bz2 emacs-e670412a3e101e70dc26e021f467faece8cb7f6b.zip | |
Update handling of advices during preload
* lisp/emacs-lisp/comp-common.el
(native-comp-never-optimize-functions): Remove macroexpand and
rename-buffer from default value.
* lisp/emacs-lisp/comp.el (comp-call-optim-form-call): Document call
optimization for advised primitives.
* lisp/emacs-lisp/nadvice.el (advice-add): Remove references to TODOs
that were completed already earlier.
* lisp/loadup.el: Disallow advices during preload. (Bug#67005)
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/comp-common.el | 9 | ||||
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 8 | ||||
| -rw-r--r-- | lisp/emacs-lisp/nadvice.el | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/lisp/emacs-lisp/comp-common.el b/lisp/emacs-lisp/comp-common.el index 6d94d1bd82e..b7a685223ed 100644 --- a/lisp/emacs-lisp/comp-common.el +++ b/lisp/emacs-lisp/comp-common.el @@ -49,11 +49,10 @@ This is intended for debugging the compiler itself. :version "28.1") (defcustom native-comp-never-optimize-functions - '(eval - ;; The following two are mandatory for Emacs to be working - ;; correctly (see comment in `advice--add-function'). DO NOT - ;; REMOVE. - macroexpand rename-buffer) + ;; We used to list those functions here that were advised during + ;; preload, but we now prefer to disallow preload advices in + ;; loadup.el (bug#67005). + '(eval) "Primitive functions to exclude from trampoline optimization. Primitive functions included in this list will not be called diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 39e32d5142c..3e5ff195764 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -2789,6 +2789,14 @@ FUNCTION can be a function-name or byte compiled function." (symbol-function callee) (cl-assert (byte-code-function-p callee)) callee)) + ;; Below call to `subrp' returns nil on an advised + ;; primitive F, so that we do not optimize calls to F + ;; with the funcall trampoline removal below. But if F + ;; is advised while we compile its call, it is very + ;; likely to be advised also when that call is executed. + ;; And in that case an "unoptimized" call to F is + ;; actually cheaper since it avoids the call to the + ;; intermediate native trampoline (bug#67005). (subrp (subrp f)) (comp-func-callee (comp-func-in-unit callee))) (cond diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el index 42027c01491..9f2b42f5765 100644 --- a/lisp/emacs-lisp/nadvice.el +++ b/lisp/emacs-lisp/nadvice.el @@ -509,8 +509,6 @@ HOW can be one of: <<>>" ;; TODO: ;; - record the advice location, to display in describe-function. - ;; - change all defadvice in lisp/**/*.el. - ;; - obsolete advice.el. (let* ((f (symbol-function symbol)) (nf (advice--normalize symbol f))) (unless (eq f nf) (fset symbol nf)) |