From: Stefan Monnier Date: Mon, 20 Oct 2014 19:23:50 +0000 (+0100) Subject: Restore temporarily reverted bytecomp change X-Git-Tag: emacs-24.4.90~341 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d20b72d9fa987ea9a511c6bed909c09929dc78f8;p=emacs.git Restore temporarily reverted bytecomp change * lisp/emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg case. Fixes: debbugs:18767 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4c9b60ea4cd..c1a57cf373e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-10-20 Stefan Monnier + + * emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg + case (bug#18767). + 2014-10-20 Glenn Morris * Version 24.4 released. diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index e5f8a8cc22a..69c4e0f1628 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3261,11 +3261,11 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (byte-defop-compiler cons 2) (byte-defop-compiler aref 2) (byte-defop-compiler set 2) -(byte-defop-compiler (= byte-eqlsign) 2-and) -(byte-defop-compiler (< byte-lss) 2-and) -(byte-defop-compiler (> byte-gtr) 2-and) -(byte-defop-compiler (<= byte-leq) 2-and) -(byte-defop-compiler (>= byte-geq) 2-and) +(byte-defop-compiler (= byte-eqlsign) 2) ;; -and bug#18767 +(byte-defop-compiler (< byte-lss) 2) ;; -and bug#18767 +(byte-defop-compiler (> byte-gtr) 2) ;; -and bug#18767 +(byte-defop-compiler (<= byte-leq) 2) ;; -and bug#18767 +(byte-defop-compiler (>= byte-geq) 2) ;; -and bug#18767 (byte-defop-compiler get 2) (byte-defop-compiler nth 2) (byte-defop-compiler substring 2-3) @@ -3332,6 +3332,7 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" (defun byte-compile-and-folded (form) "Compile calls to functions like `<='. These implicitly `and' together a bunch of two-arg bytecodes." + ;; FIXME: bug#18767 means we can't do it this way! (let ((l (length form))) (cond ((< l 3) (byte-compile-form `(progn ,(nth 1 form) t)))