From: Andrea Corallo <akrl@sdf.org>
Date: Tue, 19 Nov 2019 19:49:51 +0000 (+0100)
Subject: better comp-function-call-remove
X-Git-Tag: emacs-28.0.90~2727^2~970
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=407f5aac70f1481dfb365db7ba2e435f439498d0;p=emacs.git

better comp-function-call-remove
---

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 073af957bed..7408034b932 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -1524,8 +1524,9 @@ This can run just once."
   (when (and (get f 'pure) ; Can we just optimize pure here? See byte-opt.el
              (cl-every #'comp-mvar-const-vld args))
     (let ((val (apply f (mapcar #'comp-mvar-constant args))))
+      ;; See `comp-emit-set-const'.
       (setf (car insn) 'setimm
-            (caddr insn) (comp-add-const-to-relocs val)))))
+            (cddr insn) (list (comp-add-const-to-relocs val) val)))))
 
 (defun comp-propagate-insn (insn)
   "Propagate within INSN."