From cb2e6461f3db45df70334016b2a8411605eb847f Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Sat, 14 Sep 2019 15:25:11 +0200 Subject: [PATCH] core reorder --- lisp/emacs-lisp/comp.el | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 2679ea390a3..47b034d0938 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -205,17 +205,12 @@ LIMPLE basic block.") (type nil :documentation "When non nil is used for type propagation.")) -(cl-defstruct (comp-limplify (:copier nil)) - "Support structure used during function limplification." - (sp 0 :type fixnum - :documentation "Current stack pointer while walking LAP.") - (frame nil :type vector - :documentation "Meta-stack used to flat LAP.") - (block-name nil :type symbol - :documentation "Current basic block name.")) - (defvar comp-ctxt) ;; FIXME (to be removed) +;; Special vars used by some passes +(defvar comp-block) +(defvar comp-func) + (defun comp-add-const-to-relocs (obj) "Keep track of OBJ into the ctxt relocations. @@ -376,9 +371,14 @@ If INPUT is a string this is the file path to be compiled." ;;; Limplification pass specific code. -;; Special vars used during limplifications -(defvar comp-block) -(defvar comp-func) +(cl-defstruct (comp-limplify (:copier nil)) + "Support structure used during function limplification." + (sp 0 :type fixnum + :documentation "Current stack pointer while walking LAP.") + (frame nil :type vector + :documentation "Meta-stack used to flat LAP.") + (block-name nil :type symbol + :documentation "Current basic block name.")) (cl-defun comp-block-maybe-add (&rest args &key name &allow-other-keys) (let ((blocks (comp-func-blocks comp-func))) -- 2.39.5