emacs/gnu.emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2026-09-10 07:46:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

elisp-scope.el: Avoid excessive 'trusted-content-p' calls

Browse source 
Cache the return value of 'trusted-content-p' for the
duration of the analysis of a single form, instead of
calling 'trusted-content-p' repeatedly for (potentially)
every analyzed macro call (bug#81723).

* lisp/emacs-lisp/elisp-scope.el (elisp-scope--trust-cache):
New variable.
(elisp-scope-analyze-form): Let-bind it.
(elisp-scope--trusted-p): New helper function.
(elisp-scope-safe-macro-p): Use it.
This commit is contained in:
Eshel Yaron 2026-09-02 20:52:56 +02:00
parent 956875f822
commit 9794fa0d5d
No known key found for this signature in database
GPG key ID: EF3EE9CA35D78618
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lisp/emacs-lisp/elisp-scope.el
View file

@ -1559,6 +1559,27 @@ trusted code macro expansion is always safe."
cl-eval-when eval-when-compile eval-and-compile let-when-compile
rx cl-macrolet nnoo-define-basics))
(defvar elisp-scope--trust-cache 'none
"Cached value of `trusted-content-p'.
The function `elisp-scope--trusted-p' consults this cache. If the value
is \\+`unset', `elisp-scope--trusted-p' initializes it to the return
value of `trusted-content-p'.
The default value, \\+`none', says that the cache is disabled.
The function `elisp-scope-analyze-form' enables the cache by let-binding
this variable to \\+`unset', so that a cached value survives for the
duration of one `elisp-scope-analyze-form' call, i.e. the analysis of
one form.")
(defun elisp-scope--trusted-p ()
"Check whether the analyzed code is trusted."
(cl-case elisp-scope--trust-cache
(none (trusted-content-p))
(unset (setq elisp-scope--trust-cache (trusted-content-p)))
(otherwise elisp-scope--trust-cache)))
(defun elisp-scope-safe-macro-p (macro)
"Check whether it is safe to expand MACRO, return non-nil iff so.
@ -1570,7 +1591,7 @@ property, or if the current buffer is trusted (see `trusted-content-p')."
(or (eq elisp-scope-safe-macros t)
(memq macro elisp-scope-safe-macros)
(get macro 'safe-macro)
(trusted-content-p))))
(elisp-scope--trusted-p))))
(defvar warning-minimum-log-level)
@ -2902,6 +2923,7 @@ for the `identity' function:
(form (read-positioning-symbols stream))
(elisp-scope--counter 0)
(elisp-scope--callback callback)
(elisp-scope--trust-cache 'unset)
(max-lisp-eval-depth 32768))
(if (eq stream (current-buffer))
;; `save-excursion' so CALLBACK can change point freely.