diff options
| author | Andrea Corallo <akrl@sdf.org> | 2023-02-13 16:33:40 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2023-02-13 17:02:38 +0100 |
| commit | 5d0912f1445e33f1ccf23a84f0dc6d08c4ee2b60 (patch) | |
| tree | fa6408320ec69d65cc13c77715c06a11c0619cb7 /src | |
| parent | abfd00e5c02ec0aed8bbac1eca0d0db1874f020a (diff) | |
| download | emacs-5d0912f1445e33f1ccf23a84f0dc6d08c4ee2b60.tar.gz emacs-5d0912f1445e33f1ccf23a84f0dc6d08c4ee2b60.tar.bz2 emacs-5d0912f1445e33f1ccf23a84f0dc6d08c4ee2b60.zip | |
Rename comp-enable-subr-trampolines into native-comp-enable-subr-trampolines
* src/data.c (Ffset): Rename comp-enable-subr-trampolines into
native-comp-enable-subr-trampolines.
* src/comp.c (syms_of_comp): Likewise.
* lisp/subr.el (comp-enable-subr-trampolines): Make
comp-enable-subr-trampolines obsolete.
* lisp/startup.el (native-comp-enable-subr-trampolines)
(normal-top-level): Rename comp-enable-subr-trampolines into
native-comp-enable-subr-trampolines.
* lisp/loadup.el (dump-mode): Likewise.
* lisp/emacs-lisp/comp.el (comp-subr-trampoline-install)
(comp--trampoline-abs-filename): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/comp.c | 3 | ||||
| -rw-r--r-- | src/data.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/comp.c b/src/comp.c index 82224845bff..ba3ed95bcce 100644 --- a/src/comp.c +++ b/src/comp.c @@ -5858,7 +5858,8 @@ The last directory of this list is assumed to be the system one. */); dump reload. */ Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil); - DEFVAR_LISP ("comp-enable-subr-trampolines", Vcomp_enable_subr_trampolines, + DEFVAR_LISP ("native-comp-enable-subr-trampolines", + Vnative_comp_enable_subr_trampolines, doc: /* If non-nil, enable primitive trampoline synthesis. This makes Emacs respect redefinition or advises of primitive functions when they are called from Lisp code natively-compiled at `native-comp-speed' diff --git a/src/data.c b/src/data.c index a43fa8991fe..0f1d881e00b 100644 --- a/src/data.c +++ b/src/data.c @@ -855,7 +855,7 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0, #ifdef HAVE_NATIVE_COMP register Lisp_Object function = XSYMBOL (symbol)->u.s.function; - if (!NILP (Vcomp_enable_subr_trampolines) + if (!NILP (Vnative_comp_enable_subr_trampolines) && SUBRP (function) && !SUBR_NATIVE_COMPILEDP (function)) CALLN (Ffuncall, Qcomp_subr_trampoline_install, symbol); |