mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Rename comp-never-optimize-functions → native-comp-never-optimize-functions

Browse source 
* lisp/emacs-lisp/nadvice.el (advice--add-function): Rename
comp-never-optimize-functions → native-comp-never-optimize-functions.
* lisp/emacs-lisp/comp.el (native-comp-never-optimize-functions)
(comp-subr-trampoline-install, comp-call-optim-form-call): Likewise.
This commit is contained in:
Andrea Corallo 2021-05-06 10:26:33 +02:00
parent 85b61c0c58
commit 31ca1c3e81
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/emacs-lisp/comp.el
View file

@ -98,7 +98,7 @@ during bootstrap."
:type '(repeat regexp)
:version "28.1")
(defcustom comp-never-optimize-functions
(defcustom native-comp-never-optimize-functions
'(;; The following two are mandatory for Emacs to be working
;; correctly (see comment in `advice--add-function'). DO NOT
;; REMOVE.
@ -662,7 +662,7 @@ Useful to hook into pass checkers.")
(defun comp-subr-trampoline-install (subr-name)
"Make SUBR-NAME effectively advice-able when called from native code."
(unless (or (null comp-enable-subr-trampolines)
(memq subr-name comp-never-optimize-functions)
(memq subr-name native-comp-never-optimize-functions)
(gethash subr-name comp-installed-trampolines-h))
(cl-assert (subr-primitive-p (symbol-function subr-name)))
(comp--install-trampoline
@ -3275,7 +3275,7 @@ FUNCTION can be a function-name or byte compiled function."
(when (and callee
(or (symbolp callee)
(gethash callee (comp-ctxt-byte-func-to-func-h comp-ctxt)))
(not (memq callee comp-never-optimize-functions)))
(not (memq callee native-comp-never-optimize-functions)))
(let* ((f (if (symbolp callee)
(symbol-function callee)
(cl-assert (byte-code-function-p callee))

14
lisp/emacs-lisp/nadvice.el
View file

@ -324,13 +324,13 @@ is also interactive. There are 3 cases:
(subr-primitive-p (gv-deref ref)))
(let ((subr-name (intern (subr-name (gv-deref ref)))))
;; Requiring the native compiler to advice `macroexpand' cause a
;; circular dependency in eager macro expansion.
;; uniquify is advising `rename-buffer' while being loaded in
;; loadup.el. This would require the whole native compiler
;; machinery but we don't want to include it in the dump.
;; Because these two functions are already handled in
;; `comp-never-optimize-functions' we hack the problem this way
;; for now :/
;; circular dependency in eager macro expansion. uniquify is
;; advising `rename-buffer' while being loaded in loadup.el.
;; This would require the whole native compiler machinery but we
;; don't want to include it in the dump. Because these two
;; functions are already handled in
;; `native-comp-never-optimize-functions' we hack the problem
;; this way for now :/
(unless (memq subr-name '(macroexpand rename-buffer))
;; Must require explicitly as during bootstrap we have no
;; autoloads.