0.8.12.22: Minor changes to make SBCL build itself cleanly with

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

diff --git a/src/compiler/ltn.lisp b/src/compiler/ltn.lisp
index 552f50d..bbdb87a 100644 (file)
--- a/src/compiler/ltn.lisp
+++ b/src/compiler/ltn.lisp
@@ -313,8 +313,7 @@
           (setf (node-tail-p call) nil))
          (t
           (setf (basic-combination-info call) :full)
-          (annotate-fun-lvar (basic-combination-fun call)
-                                     nil)
+          (annotate-fun-lvar (basic-combination-fun call) nil)
           (dolist (arg (reverse args))
             (annotate-unknown-values-lvar arg))
           (flush-full-call-tail-transfer call))))
@@ -696,13 +695,13 @@
 
     (when (losers)
       (collect ((messages)
-               (count 0 +))
+               (notes 0 +))
        (flet ((lose1 (string &rest stuff)
                 (messages string)
                 (messages stuff)))
          (dolist (loser (losers))
            (when (and *efficiency-note-limit*
-                      (>= (count) *efficiency-note-limit*))
+                      (>= (notes) *efficiency-note-limit*))
              (lose1 "etc.")
              (return))
            (let* ((type (template-type loser))
@@ -721,7 +720,7 @@
               (t
                (aver (ltn-policy-safe-p ltn-policy))
                (lose1 "can't trust output type assertion under safe policy")))
-             (count 1))))
+             (notes 1))))
 
        (let ((*compiler-error-context* call))
          (compiler-notify "~{~?~^~&~6T~}"