summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/bytecomp.el
diff options
context:
space:
mode:
authorMattias EngdegÄrd <mattiase@acm.org>2023-03-02 09:56:59 +0100
committerMattias EngdegÄrd <mattiase@acm.org>2023-03-02 15:47:26 +0100
commit828c49ae29fd318547d7bbe4e7fdc65da316e309 (patch)
tree3859f77e26d13d7d760ec79b0ce1ab96ca3d77f6 /lisp/emacs-lisp/bytecomp.el
parenta1d90e48bb0076e68592d6a6880c28b52e61d219 (diff)
downloademacs-828c49ae29fd318547d7bbe4e7fdc65da316e309.tar.gz
Fix `cond` miscompilation bug
This fixes a bug that miscompiled (cond ... C S1...Sn) where S1...Sn are switch clauses (that can be compiled into a switch op) and C a non-switch clause, by tucking on an extra copy of C at the end. This was a serious wrong-code bug when the condition of C had side-effects; otherwise it was only a waste of time and space. * lisp/emacs-lisp/bytecomp.el (byte-compile-cond): Fix. * test/lisp/emacs-lisp/bytecomp-tests.el (bytecomp-tests--test-cases): Add test case.
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
-rw-r--r--lisp/emacs-lisp/bytecomp.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 095468ad978..6f3d7a70903 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -4590,6 +4590,7 @@ Return (TAIL VAR TEST CASES), where:
(if switch-prefix
(progn
(byte-compile-cond-jump-table (cdr switch-prefix) donetag)
+ (setq clause nil)
(setq clauses (car switch-prefix)))
(setq clause (car clauses))
(cond ((or (eq (car clause) t)