0.7.9.1:

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

diff --git a/src/compiler/pack.lisp b/src/compiler/pack.lisp
index e455425..01cafe4 100644 (file)
--- a/src/compiler/pack.lisp
+++ b/src/compiler/pack.lisp
@@ -31,7 +31,7 @@
 ;;;    any of the component's blocks (always-live /= 0), then there
 ;;;    is a conflict.
 ;;; -- If TN is global (Confs true), then iterate over the blocks TN
-;;;    is live in (using TN-Global-Conflicts). If the TN is live
+;;;    is live in (using TN-GLOBAL-CONFLICTS). If the TN is live
 ;;;    everywhere in the block (:LIVE), then there is a conflict
 ;;;    if the element at offset is used anywhere in the block
 ;;;    (Always-Live /= 0). Otherwise, we use the local TN number for
@@ -52,7 +52,7 @@
      (confs
       (let ((loc-confs (svref (finite-sb-conflicts sb) offset))
            (loc-live (svref (finite-sb-always-live sb) offset)))
-       (do ((conf confs (global-conflicts-tn-next conf)))
+       (do ((conf confs (global-conflicts-next-tnwise conf)))
            ((null conf)
             nil)
          (let* ((block (global-conflicts-block conf))
@@ -109,7 +109,7 @@
            (setf (sbit loc-live num) 1)
            (set-bit-vector (svref loc-confs num))))
         (confs
-         (do ((conf confs (global-conflicts-tn-next conf)))
+         (do ((conf confs (global-conflicts-next-tnwise conf)))
              ((null conf))
            (let* ((block (global-conflicts-block conf))
                   (num (ir2-block-number block))
@@ -254,7 +254,7 @@
     (dolist (sb *backend-sb-list*)
       (unless (eq (sb-kind sb) :non-packed)
        (let ((size (sb-size sb)))
-         (fill nil (finite-sb-always-live sb))
+         (fill (finite-sb-always-live sb) nil)
          (setf (finite-sb-always-live sb)
                (make-array size
                            :initial-element
@@ -265,11 +265,11 @@
                            ;; until runtime.
                            #+sb-xc (make-array 0 :element-type 'bit)))
 
-         (fill nil (finite-sb-conflicts sb))
+         (fill (finite-sb-conflicts sb) nil)
          (setf (finite-sb-conflicts sb)
                (make-array size :initial-element '#()))
 
-         (fill nil (finite-sb-live-tns sb))
+         (fill (finite-sb-live-tns sb) nil)
          (setf (finite-sb-live-tns sb)
                (make-array size :initial-element nil))))))
   (values))