fix single function compilation

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index f82993956b7b605300c98e78f621087cbb4d5f94..77cd408ce978eb448b96315f3d048c31ee80f317 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -565,7 +565,7 @@ Each element is (INDEX . VALUE)")
 
 ;; These are use by comp.el to spill data out of here
 (defvar byte-native-compiling nil)
-(defvar byte-last-lap nil)
+(defvar byte-to-native-last-lap nil)
 (defvar byte-to-native-output nil)
 (defvar byte-to-native-top-level-forms nil)
 
@@ -2274,7 +2274,7 @@ list that represents a doc string reference.
 `defvaralias', `autoload' and `custom-declare-variable' need that."
   (when byte-native-compiling
     ;; Spill output for the native compiler here
-    (push (list name byte-last-lap (apply #'vector form)) byte-to-native-output))
+    (push (list name byte-to-native-last-lap (apply #'vector form)) byte-to-native-output))
   ;; We need to examine byte-compile-dynamic-docstrings
   ;; in the input buffer (now current), not in the output buffer.
   (let ((dynamic-docstrings byte-compile-dynamic-docstrings))
@@ -3129,7 +3129,7 @@ for symbols generated by the byte compiler itself."
                        byte-compile-vector byte-compile-maxdepth)))
         (when byte-native-compiling
           ;; Spill output for the native compiler here
-          (setq byte-last-lap byte-compile-output))
+          (setq byte-to-native-last-lap byte-compile-output))
         out))
      ;; it's a trivial function
      ((cdr body) (cons 'progn (nreverse body)))

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 39f00c5792180663dcfc75ba1629e495faa1cf5b..2e98560e8f4f61c7143d57d8a713d3e7770860cc 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -270,11 +270,11 @@ Put PREFIX in front of it."
       (setf (comp-func-byte-func func)
             (byte-compile (comp-func-symbol-name func)))
       (comp-within-log-buff
-        (cl-prettyprint byte-to-native-lap-output))
+        (cl-prettyprint byte-to-native-last-lap))
       (let ((lambda-list (aref (comp-func-byte-func func) 0)))
         (setf (comp-func-args func)
               (comp-decrypt-lambda-list lambda-list)))
-      (setf (comp-func-lap func) (car byte-to-native-lap-output))
+      (setf (comp-func-lap func) byte-to-native-last-lap)
       (setf (comp-func-frame-size func) (aref (comp-func-byte-func func) 3))
       func))
 
@@ -306,7 +306,7 @@ Put PREFIX in front of it."
 If INPUT is a symbol this is the function-name to be compiled.
 If INPUT is a string this is the file path to be compiled."
   (let ((byte-native-compiling t)
-        (byte-last-lap nil)
+        (byte-to-native-last-lap nil)
         (byte-to-native-output ())
         (byte-to-native-top-level-forms ()))
     (cl-typecase input