From: Andrea Corallo <andcor03@e112547.nice.arm.com>
Date: Mon, 8 Jun 2020 16:34:46 +0000 (+0200)
Subject: * Move final log after containers has been finalized
X-Git-Tag: emacs-28.0.90~2727^2~578
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3d3737b90ab4dcded11ec716f92b9fa8a5c3fbeb;p=emacs.git

* Move final log after containers has been finalized

	* lisp/emacs-lisp/comp.el (comp-final): Remove function log.
	(comp-compile-ctxt-to-file): Add function log.
---

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index a6bf723f54c..2cde99e7280 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2305,6 +2305,9 @@ Update all insn accordingly."
 Prepare every function for final compilation and drive the C back-end."
   (let ((dir (file-name-directory name)))
     (comp-finalize-relocs)
+    (maphash (lambda (_ f)
+               (comp-log-func f 1))
+             (comp-ctxt-funcs-h comp-ctxt))
     (unless (file-exists-p dir)
       ;; In case it's created in the meanwhile.
       (ignore-error 'file-already-exists
@@ -2315,9 +2318,6 @@ Prepare every function for final compilation and drive the C back-end."
 (defun comp-final (_)
   "Final pass driving the C back-end for code emission."
   (let (compile-result)
-    (maphash (lambda (_ f)
-               (comp-log-func f 1))
-             (comp-ctxt-funcs-h comp-ctxt))
     (comp--init-ctxt)
     (unwind-protect
         (setf compile-result