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

Don't modify interactive closures destructively (Bug#60974).

Browse source 
* lisp/emacs-lisp/cconv.el (cconv-convert): When form is an
interactive lambda form, don't destructively modify it, as it might be
a constant literal. Instead, create a new list with the relevant
place(s) changed.

* test/lisp/emacs-lisp/cconv-tests.el
(cconv-tests-interactive-form-modify-bug60974): New test.
This commit is contained in:
Vibhav Pant 2023-03-01 15:04:34 +05:30
parent 186643ea8a
commit 1e5393a57a
No known key found for this signature in database
GPG key ID: E3FB28CB6AB59598
2 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

37
lisp/emacs-lisp/cconv.el
View file

@ -477,7 +477,7 @@ places where they originally did not directly appear."
branch))
cond-forms)))
(`(function (lambda ,args . ,body) . ,_)
(`(function (lambda ,args . ,body) . ,rest)
(let* ((docstring (if (eq :documentation (car-safe (car body)))
(cconv-convert (cadr (pop body)) env extend)))
(bf (if (stringp (car body)) (cdr body) body))
@ -485,15 +485,32 @@ places where they originally did not directly appear."
(gethash form cconv--interactive-form-funs)))
(wrapped (pcase if (`#'(lambda (&rest _cconv--dummy) .,_) t) (_ nil)))
(cif (when if (cconv-convert if env extend)))
(_ (pcase cif
('nil nil)
(`#',f
(setf (cadr (car bf)) (if wrapped (nth 2 f) cif))
(setq cif nil))
;; The interactive form needs special treatment, so the form
;; inside the `interactive' won't be used any further.
(_ (setf (cadr (car bf)) nil))))
(cf (cconv--convert-function args body env form docstring)))
(cf nil))
;; TODO: Because we need to non-destructively modify body, this code
;; is particularly ugly. This should ideally be moved to
;; cconv--convert-function.
(pcase cif
('nil (setq bf nil))
(`#',f
(pcase-let ((`((,f1 . (,_ . ,f2)) . ,f3) bf))
(setq bf `((,f1 . (,(if wrapped (nth 2 f) cif) . ,f2)) . ,f3)))
(setq cif nil))
;; The interactive form needs special treatment, so the form
;; inside the `interactive' won't be used any further.
(_ (pcase-let ((`((,f1 . (,_ . ,f2)) . ,f3) bf))
(setq bf `((,f1 . (nil . ,f2)) . ,f3)))))
(when bf
;; If we modified bf, re-build body and form as
;; copies with the modified bits.
(setq body (if (stringp (car body))
(cons (car body) bf)
bf)
form `(function (lambda ,args . ,body) . ,rest))
;; Also, remove the current old entry on the alist, replacing
;; it with the new one.
(let ((entry (pop cconv-freevars-alist)))
(push (cons body (cdr entry)) cconv-freevars-alist)))
(setq cf (cconv--convert-function args body env form docstring))
(if (not cif)
;; Normal case, the interactive form needs no special treatment.
cf