1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 11:50:51 -08:00

Fix byte-compilation of defalias with a constant macro cons pair

* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-defalias):
Quote the function name in '(macro . function-name), since we eval
it later.
* test/lisp/emacs-lisp/bytecomp-tests.el
(test-eager-load-macro-expand-defalias): New test.
(Bug#78792)
This commit is contained in:
Zach Shaftel 2025-06-14 20:57:21 -04:00 committed by Eli Zaretskii
parent 39721a4d79
commit 075ebed98f
2 changed files with 20 additions and 1 deletions

View file

@ -5166,7 +5166,8 @@ binding slots have been popped."
(pcase-let*
;; `macro' is non-nil if it defines a macro.
;; `fun' is the function part of `arg' (defaults to `arg').
(((or (and (or `(cons 'macro ,fun) `'(macro . ,fun)) (let macro t))
(((or (and (or `(cons 'macro ,fun) `'(macro . ,(app (list 'quote) fun)))
(let macro t))
(and (let fun arg) (let macro nil)))
arg)
;; `lam' is the lambda expression in `fun' (or nil if not

View file

@ -1322,6 +1322,24 @@ byte-compiled. Run with dynamic binding."
(defun def () (m))))
(should (equal (funcall 'def) 4)))
(ert-deftest test-eager-load-macro-expand-defalias ()
(ert-with-temp-file elfile
:suffix ".el"
(write-region
(concat ";;; -*- lexical-binding: t -*-\n"
(mapconcat #'prin1-to-string
'((defalias 'nothing '(macro . ignore))
(defalias 'something (cons 'macro #'identity))
(defalias 'five (cons 'macro (lambda (&rest _) 5)))
(eval-when-compile
(defun def () (or (nothing t) (something (five nil))))))
"\n"))
nil elfile)
(let* ((byte-compile-debug t)
(byte-compile-dest-file-function #'ignore))
(byte-compile-file elfile)
(should (equal (funcall 'def) 5)))))
(defmacro bytecomp-tests--with-temp-file (file-name-var &rest body)
(declare (indent 1))
(cl-check-type file-name-var symbol)