procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not install a subr trampoline twice

Browse source 
* src/comp.c (syms_of_comp): Define and initialize
	'Vcomp_installed_trampolines_h'.
	(Fcomp__install_trampoline): Fill 'Vcomp_installed_trampolines_h'
	* lisp/emacs-lisp/comp.el (comp--subr-safe-advice): Make use of
	`comp-installed-trampolines-h' to guard against installing a
	trampoline twice.
This commit is contained in:
Andrea Corallo 2020-09-23 21:56:52 +02:00
parent b94a0a931e
commit 94736c413f
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2601,7 +2601,8 @@ Return the its filename if found or nil otherwise."
;;;###autoload
(defun comp--subr-safe-advice (subr-name)
"Make SUBR-NAME effectively advice-able when called from native code."
(unless (memq subr-name comp-never-optimize-functions)
(unless (or (memq subr-name comp-never-optimize-functions)
(gethash subr-name comp-installed-trampolines-h))
(let ((trampoline-sym (comp-trampoline-sym subr-name)))
(cl-assert (subr-primitive-p (symbol-function subr-name)))
(load (or (comp-search-trampoline subr-name)