[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp 530faee 09/10: Fix free function compilation
From: |
Andrea Corallo |
Subject: |
feature/native-comp 530faee 09/10: Fix free function compilation |
Date: |
Sun, 29 Mar 2020 09:12:53 -0400 (EDT) |
branch: feature/native-comp
commit 530faee2752c7b316fa21f2ac4d1266d3e7a38e6
Author: Andrea Corallo <address@hidden>
Commit: Andrea Corallo <address@hidden>
Fix free function compilation
---
lisp/emacs-lisp/bytecomp.el | 3 ++-
lisp/emacs-lisp/comp.el | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 977f137..b363107 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -3120,7 +3120,8 @@ for symbols generated by the byte compiler itself."
(out (list 'byte-code (byte-compile-lapcode byte-compile-output)
byte-compile-vector byte-compile-maxdepth)))
(when (and byte-native-compiling
- (null byte-compile-not-top-level))
+ (or (null byte-compile-not-top-level)
+ (eq byte-native-compiling 'free-func)))
;; Spill LAP for the native compiler here
(push (cons byte-compile-current-form byte-compile-output)
byte-to-native-lap))
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 92d0655..d29e2f5 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -514,7 +514,8 @@ Put PREFIX in front of it."
(cl-defgeneric comp-spill-lap-function ((function-name symbol))
"Byte compile FUNCTION-NAME spilling data from the byte compiler."
- (let* ((f (symbol-function function-name))
+ (let* ((byte-native-compiling 'free-func)
+ (f (symbol-function function-name))
(c-name (comp-c-func-name function-name "F"))
(func (make-comp-func :name function-name
:c-name c-name
@@ -536,8 +537,8 @@ Put PREFIX in front of it."
(comp-func-frame-size func)
(comp-byte-frame-size (comp-func-byte-func func))))
(setf (comp-ctxt-top-level-forms comp-ctxt)
- (list (make-byte-to-native-function :name function-name)))
- (setf (byte-to-native-function-c-name func) c-name)
+ (list (make-byte-to-native-function :name function-name
+ :c-name c-name)))
;; Create the default array.
(puthash 0 (comp-func-frame-size func) (comp-func-array-h func))
(comp-add-func-to-ctxt func))))
- feature/native-comp updated (bb0496e -> 00ee320), Andrea Corallo, 2020/03/29
- feature/native-comp 05f89e8 02/10: src/comp.c (Fcomp__init_ctxt): Aesthetic, Andrea Corallo, 2020/03/29
- feature/native-comp 9d8ce52 03/10: * comp.c (maybe_defer_native_compilation): Compile comp dependecies., Andrea Corallo, 2020/03/29
- feature/native-comp 3c5e3ca 05/10: * test/src/comp-test-funcs.el (comp-test-big-interactive): New test, Andrea Corallo, 2020/03/29
- feature/native-comp 79483a5 01/10: * .gitlab-ci.yml (test-native-bootstrap-speed*): Timeout to 8h, Andrea Corallo, 2020/03/29
- feature/native-comp d5f6dc1 04/10: Prevent collisions in C namespace and function shadowing, Andrea Corallo, 2020/03/29
- feature/native-comp 89cbff3 06/10: * test/src/comp-tests.el (comp-tests-doc): Fix, Andrea Corallo, 2020/03/29
- feature/native-comp 530faee 09/10: Fix free function compilation,
Andrea Corallo <=
- feature/native-comp c69c185 07/10: Add comp-test-40187 checking function shadowing., Andrea Corallo, 2020/03/29
- feature/native-comp 53f9bc6 08/10: * comp.el (comp-output-base-filename): Handle src being a symbol, Andrea Corallo, 2020/03/29
- feature/native-comp 00ee320 10/10: Merge remote-tracking branch 'savannah/master' into HEAD, Andrea Corallo, 2020/03/29