mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-13 09:32:47 +00:00
Code Issues Releases Activity

* Move context output computation in `comp-spill-lap-function'

Browse Source 
* lisp/emacs-lisp/comp.el (comp-spill-lap-function): Move
	output filename computation here.
	(native-compile): From here.
This commit is contained in:
Andrea Corallo 2020-10-10 21:16:40 +02:00
parent 237fd33aef
commit fda798808f
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lisp/emacs-lisp/comp.el
View File

@ -662,6 +662,9 @@ clashes."
(cl-defmethod comp-spill-lap-function ((function-name symbol))
"Byte-compile FUNCTION-NAME spilling data from the byte compiler."
(unless (comp-ctxt-output comp-ctxt)
(setf (comp-ctxt-output comp-ctxt)
(make-temp-file (symbol-name function-name) nil ".eln")))
(let* ((f (symbol-function function-name))
(c-name (comp-c-func-name function-name "F"))
(func (make-comp-func-l :name function-name
@ -740,6 +743,11 @@ clashes."
(byte-compile-file filename)
(unless byte-to-native-top-level-forms
(signal 'native-compiler-error-empty-byte filename))
(unless (comp-ctxt-output comp-ctxt)
(setf (comp-ctxt-output comp-ctxt) (comp-el-to-eln-filename
filename
(when byte-native-for-bootstrap
(car (last comp-eln-load-path))))))
(setf (comp-ctxt-top-level-forms comp-ctxt)
(cl-loop
for form in (reverse byte-to-native-top-level-forms)
@ -2815,18 +2823,8 @@ Return the compile object filename."
(comp-native-compiling t)
;; Have byte compiler signal an error when compilation fails.
(byte-compile-debug t)
(comp-ctxt
(make-comp-ctxt
:output (or (when output
(expand-file-name output))
(if (symbolp function-or-file)
(make-temp-file (symbol-name function-or-file) nil
".eln")
(comp-el-to-eln-filename
function-or-file
(when byte-native-for-bootstrap
(car (last comp-eln-load-path))))))
:with-late-load with-late-load)))
(comp-ctxt (make-comp-ctxt :output output
:with-late-load with-late-load)))
(comp-log "\n \n" 1)
(condition-case err
(mapc (lambda (pass)