fix compilation of devar defconst with doc string

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 1666dff711759db42b24e92f72d55be1dd19d868..72e58350209c2b6471f85cb2dba77bac1fc03e4c 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2276,7 +2276,7 @@ we output that argument and the following argument
 QUOTED says that we have to put a quote before the
 list that represents a doc string reference.
 `defvaralias', `autoload' and `custom-declare-variable' need that."
-  (when byte-native-compiling
+  (when (and byte-native-compiling name)
     ;; Spill bytecode output for the native compiler here
     (push (cons name (apply #'vector form))
           byte-to-native-bytecode))

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 584a02af0e3ef20702632b86a90593e428f3fe2a..3f8482b5d028e4256eaa653231ddd5e9dcfbb965 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -408,7 +408,7 @@ Put PREFIX in front of it."
                              ('defvar (cdr x))
                              ('defconst (cdr x))))
                          byte-to-native-top-level-forms)))
-  (cl-loop for (name . bytecode) in (remove-if-not #'car byte-to-native-bytecode)
+  (cl-loop for (name . bytecode) in byte-to-native-bytecode
            for lap = (alist-get name byte-to-native-lap)
            for lambda-list = (aref bytecode 0)
            for func = (make-comp-func :symbol-name name