From: Andrea Corallo <akrl@sdf.org>
Date: Tue, 28 Mar 2023 12:56:37 +0000 (+0200)
Subject: Revert "* lisp/emacs-lisp/comp.el (comp-emit-set-call-subr): Improve..."
X-Git-Tag: emacs-29.0.90~71
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b66d8abd0119a250bc81ca7625a0c8de3e40555;p=emacs.git

Revert "* lisp/emacs-lisp/comp.el (comp-emit-set-call-subr): Improve..."

This reverts commit 4a7a0c9a9f521b04b23580901e9c0a662b504e32.

These patch series caused a number of regression and more analysis is
required.
---

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 3dcbc2cca4d..febca8df19c 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -1773,7 +1773,7 @@ SP-DELTA is the stack adjustment."
              (maxarg (cdr arity)))
         (when (eq maxarg 'unevalled)
           (signal 'native-ice (list "subr contains unevalled args" subr-name)))
-        (if (not (subr-primitive-p subr-name))
+        (if (not (subrp subr-name))
             ;; The primitive got redefined before the compiler is
             ;; invoked! (bug#61917)
             (comp-emit-set-call `(callref funcall