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 3dcbc2cca4d64e480f3bd9d6a87036dff4fdd39c..febca8df19c5bfbab8c2c6731875ee2d8569bc97 100644 (file)
--- 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