core reorder

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 2679ea390a318ca9a144c189d02bd429bbbd011f..47b034d0938fc6f79c719653f1793c77973bb313 100644 (file)
--- 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)
+
 \f
 (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."
 \f
 ;;; 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)))