* Fix defsbust declare effectiveness introduced by 80d7f710 (Bug#43280).

	* lisp/emacs-lisp/byte-run.el (defsubst): Do not add a speed
	declaration as this breaks a pre existing ones if present but
	rather calls directly `byte-run--set-speed'.

diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 8c16c172bedb37028dafd40052ddd7aa076fbb2f..df693ab1c8310d7ff7019b02e57f4adcff91461f 100644 (file)
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -363,13 +363,12 @@ You don't need this.  (See bytecomp.el commentary for more details.)
   (or (memq (get name 'byte-optimizer)
            '(nil byte-compile-inline-expand))
       (error "`%s' is a primitive" name))
+  ;; Never native-compile defsubsts as we need the byte
+  ;; definition in `byte-compile-unfold-bcf' to perform the
+  ;; inlining (Bug#42664).
+  (byte-run--set-speed name nil -1)
   `(prog1
-       (defun ,name ,arglist
-         ;; Never native-compile defsubsts as we need the byte
-         ;; definition in `byte-compile-unfold-bcf' to perform the
-         ;; inlining (Bug#42664).
-         (declare (speed -1))
-         ,@body)
+       (defun ,name ,arglist ,@body)
      (eval-and-compile
        (put ',name 'byte-optimizer 'byte-compile-inline-expand))))