mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-07 15:00:34 -08:00
Code Issues Projects Releases Wiki Activity

Don't propagate lexical variables into inlined functions

Browse source 
Functions compiled when inlined (thus from inside the optimiser)
mustn't retain the lexical environment of the caller or there will be
tears.  See discussion at
https://lists.gnu.org/archive/html/emacs-devel/2021-05/msg01227.html .

Bug found by Stefan Monnier.

* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand):
Bind byte-optimize--lexvars to nil when re-entering the compiler
recursively.
* test/lisp/emacs-lisp/bytecomp-resources/bc-test-alpha.el:
* test/lisp/emacs-lisp/bytecomp-resources/bc-test-beta.el: New files.
* test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-defsubst): New test.
This commit is contained in:
Mattias Engdegård 2021-05-27 14:03:14 +02:00
parent 501296f994
commit 40d2970f43
4 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/emacs-lisp/byte-opt.el
View file

@ -278,7 +278,10 @@
;; first, and then inline its byte-code. This also has the advantage
;; that the final code does not depend on the order of compilation
;; of ELisp files, making the build more reproducible.
(byte-compile name)
;; Since we are called from inside the optimiser, we need to make
;; sure not to propagate lexvar values.
(dlet ((byte-optimize--lexvars nil))
(byte-compile name))
`(,(symbol-function name) ,@(cdr form))))
(_ ;; Give up on inlining.