(I seem to've screwed up during the checkin of 0.pre7.131 before, so

[sbcl.git] / src / compiler / main.lisp

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index 37ae369..0fc8dc0 100644 (file)
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -14,10 +14,10 @@
 (in-package "SB!C")
 
 ;;; FIXME: Doesn't this belong somewhere else, like early-c.lisp?
-(declaim (special *constants* *free-variables* *component-being-compiled*
+(declaim (special *constants* *free-vars* *component-being-compiled*
                  *code-vector* *next-location* *result-fixups*
-                 *free-functions* *source-paths*
-                 *seen-blocks* *seen-functions* *list-conflicts-table*
+                 *free-funs* *source-paths*
+                 *seen-blocks* *seen-funs* *list-conflicts-table*
                  *continuation-number* *continuation-numbers*
                  *number-continuations* *tn-id* *tn-ids* *id-tns*
                  *label-ids* *label-id* *id-labels*
@@ -507,7 +507,7 @@
 ;;;; global data structures entirely when possible and consing up the
 ;;;; others from scratch instead of clearing and reusing them?
 
-;;; Clear the INFO in constants in the *FREE-VARIABLES*, etc. In
+;;; Clear the INFO in constants in the *FREE-VARS*, etc. In
 ;;; addition to allowing stuff to be reclaimed, this is required for
 ;;; correct assignment of constant offsets, since we need to assign a
 ;;; new offset for each component. We don't clear the FUNCTIONAL-INFO
@@ -522,7 +522,7 @@
             (declare (ignore k))
             (when (constant-p v)
               (setf (leaf-info v) nil)))
-          *free-variables*)
+          *free-vars*)
   (values))
 
 ;;; Blow away the REFS for all global variables, and let COMPONENT
@@ -541,8 +541,8 @@
                      x))
           (here-p (x)
             (eq (node-component x) component)))
-    (blast *free-variables*)
-    (blast *free-functions*)
+    (blast *free-vars*)
+    (blast *free-funs*)
     (blast *constants*))
   (values))
 
@@ -555,14 +555,14 @@
 (defun clear-stuff (&optional (debug-too t))
 
   ;; Clear global tables.
-  (when (boundp '*free-functions*)
-    (clrhash *free-functions*)
-    (clrhash *free-variables*)
+  (when (boundp '*free-funs*)
+    (clrhash *free-funs*)
+    (clrhash *free-vars*)
     (clrhash *constants*))
 
   ;; Clear debug counters and tables.
   (clrhash *seen-blocks*)
-  (clrhash *seen-functions*)
+  (clrhash *seen-funs*)
   (clrhash *list-conflicts-table*)
 
   (when debug-too