Revert "Revert "Revert "Revert "fixup! Update bytecomp-revert.patch""""

This reverts commit 3d54e9e247.
This commit is contained in:
Brian Leung 2024-01-20 01:08:42 -08:00
parent ceacea3bc7
commit 7744578ae9
No known key found for this signature in database
GPG key ID: 2D86D6A94C8BB3B1

View file

@ -1,5 +1,5 @@
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 6c5051d70c4..be079346911 100644 index 6c5051d70c4..a0063cbef7b 100644
--- a/lisp/emacs-lisp/bytecomp.el --- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el
@@ -3570,8 +3570,6 @@ byte-compile-form @@ -3570,8 +3570,6 @@ byte-compile-form
@ -11,6 +11,20 @@ index 6c5051d70c4..be079346911 100644
(byte-compile-warning-enabled-p (byte-compile-warning-enabled-p
'ignored-return-value (car form))) 'ignored-return-value (car form)))
(byte-compile-warn-x (byte-compile-warn-x
@@ -4515,8 +4513,11 @@ byte-compile-goto-if
(defun byte-compile-ignore (form)
(dolist (arg (cdr form))
- ;; Compile each argument for-effect but suppress unused-value warnings.
- (byte-compile-form arg 'for-effect-no-warn))
+ ;; Compile args for value (to avoid warnings about unused values),
+ ;; emit a discard after each, and trust the LAP peephole optimiser
+ ;; to annihilate useless ops.
+ (byte-compile-form arg)
+ (byte-compile-discard))
(byte-compile-form nil))
;; Return the list of items in CONDITION-PARAM that match PRED-LIST.
-- --
2.42.0 2.42.0