diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2021-05-27 14:03:14 +0200 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2021-05-27 14:16:17 +0200 |
| commit | 40d2970f4360bd942ffc3f86db9ff1499a5a5393 (patch) | |
| tree | ad709ac8bb438e17b724b30b97161776386039d4 /lisp/emacs-lisp/byte-opt.el | |
| parent | 501296f994ba8b578d8a546eddfd2cdc365305f3 (diff) | |
| download | emacs-40d2970f4360bd942ffc3f86db9ff1499a5a5393.tar.gz emacs-40d2970f4360bd942ffc3f86db9ff1499a5a5393.tar.bz2 emacs-40d2970f4360bd942ffc3f86db9ff1499a5a5393.zip | |
Don't propagate lexical variables into inlined functions
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.
Diffstat (limited to 'lisp/emacs-lisp/byte-opt.el')
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 99b5319ab3d..842697c7245 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -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. |