Do not install a subr trampoline twice

	* 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.

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index e33d58cb406c7e45a18c2ccdd198217a98d77203..8b8b111640a9dc2cc18615a57c5aaf116b45ab20 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -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)

diff --git a/src/comp.c b/src/comp.c
index db6aee9d7b1074cf9584e9a61ecc1efdf0e7e365..15782ccb1628085c0a65a04f7a560ecc42d1ce86 100644 (file)
--- a/src/comp.c
+++ b/src/comp.c
@@ -4126,6 +4126,7 @@ DEFUN ("comp--install-trampoline", Fcomp__install_trampoline,
       if (EQ (subr, orig_subr))
        {
          freloc.link_table[i] = XSUBR (trampoline)->function.a0;
+         Fputhash (subr_name, Qt, Vcomp_installed_trampolines_h);
          return Qt;
        }
       i++;
@@ -5257,6 +5258,10 @@ The last directory of this list is assumed to be the system one.  */);
      dump reload.  */
   Vcomp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil);
 
+  DEFVAR_LISP ("comp-installed-trampolines-h", Vcomp_installed_trampolines_h,
+              doc: /* Hash table subr-name -> bool.  */);
+  Vcomp_installed_trampolines_h = CALLN (Fmake_hash_table);
+
 #endif /* #ifdef HAVE_NATIVE_COMP */
 
   defsubr (&Snative_comp_available_p);