emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

feature/native-comp 3e133cc: Fix `no-byte-compile' native compilation in


From: Andrea Corallo
Subject: feature/native-comp 3e133cc: Fix `no-byte-compile' native compilation interaction (bug#47169)
Date: Tue, 16 Mar 2021 14:03:27 -0400 (EDT)

branch: feature/native-comp
commit 3e133cc050926284109fe61f4789f67676491ffa
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>

    Fix `no-byte-compile' native compilation interaction (bug#47169)
    
        * lisp/emacs-lisp/comp.el (comp-spill-lap-function): Throw
        no-native-compile when `byte-native-qualities' are null.
        * lisp/emacs-lisp/bytecomp.el (byte-compile-from-buffer): No need
        to consider `no-byte-compile'.
---
 lisp/emacs-lisp/bytecomp.el | 3 +--
 lisp/emacs-lisp/comp.el     | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 6b874b6..b04286c 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2277,8 +2277,7 @@ With argument ARG, insert value in current buffer after 
the form."
           (push `(comp-native-driver-options . ,comp-native-driver-options)
                 byte-native-qualities)
           (defvar no-native-compile)
-          ;; `no-byte-compile' implies also `no-native-compile'.
-          (push `(no-native-compile . ,(or no-byte-compile no-native-compile))
+          (push `(no-native-compile . ,no-native-compile)
                 byte-native-qualities))
 
        ;; Compile the forms from the input buffer.
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index a3a481c..6da1a79 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -1315,7 +1315,8 @@ clashes."
 (cl-defmethod comp-spill-lap-function ((filename string))
   "Byte-compile FILENAME, spilling data from the byte compiler."
   (byte-compile-file filename)
-  (when (alist-get 'no-native-compile byte-native-qualities)
+  (when (or (null byte-native-qualities)
+            (alist-get 'no-native-compile byte-native-qualities))
     (throw 'no-native-compile nil))
   (unless byte-to-native-top-level-forms
     (signal 'native-compiler-error-empty-byte filename))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]