X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fdebug.lisp;h=56c5b61945ad21d7a01b58a11a3cd60ee6d03119;hb=35fecfc13c93b85d30a23375ca2850cbbf4a923e;hp=9e543c2ce6055a2316ed25ad70f4440286ee9414;hpb=82653abf5573c22c691e2243b70647ecdaa6aea8;p=sbcl.git

diff --git a/src/compiler/debug.lisp b/src/compiler/debug.lisp
index 9e543c2..56c5b61 100644
--- a/src/compiler/debug.lisp
+++ b/src/compiler/debug.lisp
@@ -84,7 +84,8 @@
   (dolist (c components)
     (let* ((head (component-head c))
 	   (tail (component-tail c)))
-      (unless (and (null (block-pred head)) (null (block-succ tail)))
+      (unless (and (null (block-pred head))
+		   (null (block-succ tail)))
 	(barf "~S is malformed." c))
 
       (do ((prev nil block)
@@ -178,7 +179,7 @@
 	 (barf "The function for XEP ~S has kind." functional))
        (unless (eq (functional-entry-fun fun) functional)
 	 (barf "bad back-pointer in function for XEP ~S" functional))))
-    ((:let :mv-let :assignment)
+    ((:let :mv-let :assignment) ; i.e. SOMEWHAT-LETLIKE-P
      (check-fun-reached (lambda-home functional) functional)
      (when (functional-entry-fun functional)
        (barf "The LET ~S has entry function." functional))
@@ -245,7 +246,7 @@
 
 (defun check-fun-consistency (components)
   (dolist (c components)
-    (dolist (new-fun (component-new-funs c))
+    (dolist (new-fun (component-new-functionals c))
       (observe-functional new-fun))
     (dolist (fun (component-lambdas c))
       (when (eq (functional-kind fun) :external)
@@ -257,7 +258,7 @@
 	(observe-functional let))))
 
   (dolist (c components)
-    (dolist (new-fun (component-new-funs c))
+    (dolist (new-fun (component-new-functionals c))
       (check-fun-stuff new-fun))
     (dolist (fun (component-lambdas c))
       (when (eq (functional-kind fun) :deleted)
@@ -703,7 +704,7 @@
 	       ((:environment :debug-environment) (incf environment))
 	       (t (incf global)))
 	     (do ((conf (tn-global-conflicts tn)
-			(global-conflicts-tn-next conf)))
+			(global-conflicts-next-tnwise conf)))
 		 ((null conf))
 	       (incf confs)))
 	    (t
@@ -754,7 +755,7 @@
 			    (component-info component)))
 	  (barf "~S not in COMPONENT-TNs for ~S" tn component)))
        (conf
-	(do ((conf conf (global-conflicts-tn-next conf))
+	(do ((conf conf (global-conflicts-next-tnwise conf))
 	     (prev nil conf))
 	    ((null conf))
 	  (unless (eq (global-conflicts-tn conf) tn)
@@ -797,7 +798,7 @@
 (defun check-block-conflicts (component)
   (do-ir2-blocks (block component)
     (do ((conf (ir2-block-global-tns block)
-	       (global-conflicts-next conf))
+	       (global-conflicts-next-blockwise conf))
 	 (prev nil conf))
 	((null conf))
       (when prev
@@ -805,7 +806,7 @@
 		   (tn-number (global-conflicts-tn prev)))
 	  (barf "~S and ~S out of order in ~S" prev conf block)))
 
-      (unless (find-in #'global-conflicts-tn-next
+      (unless (find-in #'global-conflicts-next-tnwise
 		       conf
 		       (tn-global-conflicts
 			(global-conflicts-tn conf)))
@@ -834,7 +835,7 @@
 	   (fp (ir2-physenv-old-fp 2env))
 	   (2block (block-info (lambda-block (physenv-lambda env)))))
       (do ((conf (ir2-block-global-tns 2block)
-		 (global-conflicts-next conf)))
+		 (global-conflicts-next-blockwise conf)))
 	  ((null conf))
 	(let ((tn (global-conflicts-tn conf)))
 	  (unless (or (eq (global-conflicts-kind conf) :write)
@@ -1119,7 +1120,7 @@
 (defun add-always-live-tns (block tn)
   (declare (type ir2-block block) (type tn tn))
   (do ((conf (ir2-block-global-tns block)
-	     (global-conflicts-next conf)))
+	     (global-conflicts-next-blockwise conf)))
       ((null conf))
     (when (eq (global-conflicts-kind conf) :live)
       (let ((btn (global-conflicts-tn conf)))
@@ -1153,7 +1154,7 @@
   (let ((confs (tn-global-conflicts tn)))
     (cond (confs
 	   (clrhash *list-conflicts-table*)
-	   (do ((conf confs (global-conflicts-tn-next conf)))
+	   (do ((conf confs (global-conflicts-next-tnwise conf)))
 	       ((null conf))
 	     (let ((block (global-conflicts-block conf)))
 	       (add-always-live-tns block tn)
@@ -1178,7 +1179,7 @@
 				(not (tn-global-conflicts tn)))
 		       (res tn)))))
 	       (do ((gtn (ir2-block-global-tns block)
-			 (global-conflicts-next gtn)))
+			 (global-conflicts-next-blockwise gtn)))
 		   ((null gtn))
 		 (when (or (eq (global-conflicts-kind gtn) :live)
 			   (/= (sbit confs (global-conflicts-number gtn)) 0))