From 11f0bd444b2ed6aa834f4d299c9fb715974d2c45 Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Wed, 24 Feb 2016 21:03:02 -0500
Subject: [PATCH] Fix some style-warnings when bootstrapping with CCL

- unused LOOP variables produce warnings
- READ-SIGNED-SUFFIX referenced DISASSEM-STATE before it was defined
---
 src/compiler/disassem.lisp | 14 +++++++-------
 src/compiler/main.lisp     |  2 +-
 tools-for-build/ucd.lisp   |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/compiler/disassem.lisp b/src/compiler/disassem.lisp
index 621963408..e52d1784a 100644
--- a/src/compiler/disassem.lisp
+++ b/src/compiler/disassem.lisp
@@ -1089,13 +1089,6 @@
 (defun princ16 (value stream)
   (write value :stream stream :radix t :base 16 :escape nil))
 
-(declaim (ftype function read-suffix))
-(defun read-signed-suffix (length dstate)
-  (declare (type (member 8 16 32 64) length)
-           (type disassem-state dstate)
-           (optimize (speed 3) (safety 0)))
-  (sign-extend (read-suffix length dstate) length))
-
 (defstruct (storage-info (:copier nil))
   (groups nil :type list)               ; alist of (name . location-group)
   (debug-vars #() :type vector))
@@ -1198,3 +1191,10 @@
 ;;; DSTATE.
 (defun dstate-get-inst-prop (dstate name)
   (member name (dstate-inst-properties dstate) :test #'eq))
+
+(declaim (ftype function read-suffix))
+(defun read-signed-suffix (length dstate)
+  (declare (type (member 8 16 32 64) length)
+           (type disassem-state dstate)
+           (optimize (speed 3) (safety 0)))
+  (sign-extend (read-suffix length dstate) length))
diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index 2fe851925..51373939c 100644
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -2107,7 +2107,7 @@ SPEED and COMPILATION-SPEED optimization values, and the
              (let* ((*constants-created-since-last-init* nil)
                     (circular-ref
                      (catch 'pending-init
-                       (loop for (name form) on (cdr info) by #'cddr
+                       (loop for (nil form) on (cdr info) by #'cddr
                          collect form into forms
                          finally (or (fopcompile-constant-init-forms fasl forms)
                                      (compile-make-load-form-init-forms forms)))
diff --git a/tools-for-build/ucd.lisp b/tools-for-build/ucd.lisp
index 2c923b969..fddee508d 100644
--- a/tools-for-build/ucd.lisp
+++ b/tools-for-build/ucd.lisp
@@ -332,8 +332,7 @@ Length should be adjusted when the standard changes.")
 (defun fixup-decompositions ()
   (loop for did-something = nil
         do
-        (loop for code being each hash-key of *ucd-entries*
-              using (hash-value ucd)
+        (loop for ucd being each hash-value of *ucd-entries*
               when (and (ucd-decomp ucd)
                         (not (logbitp 7 (elt (aref *misc-table* (ucd-misc ucd)) 4))))
               do
-- 
2.11.4.GIT