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

* lisp/emacs-lisp/cl-generic.el (cl--generic-lambda): Fix bug#57903

Browse source 
Fall back to old slower calling convention in dynbound code (bug#56596).
This commit is contained in:
Stefan Monnier 2022-09-19 16:19:44 -04:00
parent 4b84f44015
commit bd40ec5d57
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lisp/emacs-lisp/cl-generic.el
View file

@ -425,11 +425,13 @@ the specializer used will be the one returned by BODY."
;; only called with explicit arguments.
(uses-cnm (macroexp--fgrep `((,cnm) (,nmp)) nbody))
(λ-lift (mapcar #'car uses-cnm)))
(if (not uses-cnm)
(cons nil
`#'(lambda (,@args)
,@(car parsed-body)
,nbody))
(cond
((not uses-cnm)
(cons nil
`#'(lambda (,@args)
,@(car parsed-body)
,nbody)))
(lexical-binding
(cons 'curried
`#'(lambda (,nm) ;Called when constructing the effective method.
(let ((,nmp (if (cl--generic-isnot-nnm-p ,nm)
@ -465,7 +467,20 @@ the specializer used will be the one returned by BODY."
;; A destructuring-bind would do the trick
;; as well when/if it's more efficient.
(apply (lambda (,@λ-lift ,@args) ,nbody)
,@λ-lift ,arglist)))))))))
,@λ-lift ,arglist)))))))
(t
(cons t
`#'(lambda (,cnm ,@args)
,@(car parsed-body)
,(macroexp-warn-and-return
"cl-defmethod used without lexical-binding"
(if (not (assq nmp uses-cnm))
nbody
`(let ((,nmp (lambda ()
(cl--generic-isnot-nnm-p ,cnm))))
,nbody))
'lexical t)))))
))
(f (error "Unexpected macroexpansion result: %S" f))))))
(put 'cl-defmethod 'function-documentation