0.8.0.58:

        Minor fixes:
        ... don't define a LENGTH type for disassembly; we're not
        allowed to do that, because LENGTH is in the CL package.  Call
        it DISASSEM-LENGTH instead.  (reported by rtoy on #lisp IRC)
        ... cut'n'pasteo: restart print functions in warm init now refer
	to variables that are bound, rather than those that aren't.

diff --git a/NEWS b/NEWS
index 4febc91..98e5991 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1811,6 +1811,8 @@ changes in sbcl-0.8.1 relative to sbcl-0.8.0:
     respectively change and preserve the value.
   * fixed bug 63: the code walker, part of the implementation of CLOS,
     is better at handling symbol macros.
+  * bug fix: there is no longer a type named LENGTH.  (reported by
+    Raymond Toy)
   * fixed some bugs revealed by Paul Dietz' test suite:
     ** NIL is now allowed as a structure slot name.
     ** arbitrary numbers, not just reals, are allowed in certain

diff --git a/src/cold/warm.lisp b/src/cold/warm.lisp
index 1528544..546f45b 100644 (file)
--- a/src/cold/warm.lisp
+++ b/src/cold/warm.lisp
@@ -163,9 +163,11 @@
   (let ((fullname (concatenate 'string stem ".lisp")))
     (sb-int:/show "about to compile" fullname)
     (flet ((report-recompile-restart (stream)
-             (format stream "Recompile file ~S" src))
+             (format stream "Recompile file ~S" fullname))
            (report-continue-restart (stream)
-             (format stream "Continue, using possibly bogus file ~S" obj)))
+             (format stream
+                    "Continue, using possibly bogus file ~S"
+                    (compile-file-pathname fullname))))
       (tagbody
        retry-compile-file
          (multiple-value-bind (output-truename warnings-p failure-p)
@@ -173,12 +175,12 @@
            (declare (ignore warnings-p))
           (sb-int:/show "done compiling" fullname)
            (cond ((not output-truename)
-                  (error "COMPILE-FILE of ~S failed." src))
+                  (error "COMPILE-FILE of ~S failed." fullname))
                  (failure-p
                  (unwind-protect
                       (restart-case
                           (error "FAILURE-P was set when creating ~S."
-                                 obj)
+                                 output-truename)
                         (recompile ()
                           :report report-recompile-restart
                           (go retry-compile-file))

diff --git a/src/compiler/disassem.lisp b/src/compiler/disassem.lisp
index 3219494..785c81f 100644 (file)
--- a/src/compiler/disassem.lisp
+++ b/src/compiler/disassem.lisp
@@ -19,7 +19,7 @@
 (deftype alignment () '(integer 0 64))
 (deftype offset () '(signed-byte 24))
 (deftype address () '(unsigned-byte 32))
-(deftype length () '(unsigned-byte 24))
+(deftype disassem-length () '(unsigned-byte 24))
 (deftype column () '(integer 0 1000))
 
 (def!constant max-filtered-value-index 32)
@@ -232,7 +232,7 @@
   (mask dchunk-zero :type dchunk)       ; bits in the inst that are constant
   (id dchunk-zero :type dchunk)         ; value of those constant bits
 
-  (length 0 :type length)               ; in bytes
+  (length 0 :type disassem-length)               ; in bytes
 
   (print-name nil :type symbol)
 
@@ -322,7 +322,7 @@
   (name nil)
   (args nil :type list)
 
-  (length 0 :type length)               ; in bytes
+  (length 0 :type disassem-length)               ; in bytes
 
   (default-printer nil :type list))
 \f
@@ -946,7 +946,7 @@
                    (let ((form (maybe-listify adjusted-forms)))
                      (if (and (not (eq use-label t))
                               (not (atom adjusted-forms))
-                              (/= (Length adjusted-forms) 1))
+                              (/= (length adjusted-forms) 1))
                          (pd-error
                           "cannot label a multiple-field argument ~
                               unless using a function: ~S" arg)
@@ -1512,11 +1512,11 @@
 (declaim (maybe-inline sign-extend aligned-p align tab tab0))
 
 (defun bytes-to-bits (bytes)
-  (declare (type length bytes))
+  (declare (type disassem-length bytes))
   (* bytes sb!vm:n-byte-bits))
 
 (defun bits-to-bytes (bits)
-  (declare (type length bits))
+  (declare (type disassem-length bits))
   (multiple-value-bind (bytes rbits)
       (truncate bits sb!vm:n-byte-bits)
     (when (not (zerop rbits))

diff --git a/src/compiler/target-disassem.lisp b/src/compiler/target-disassem.lisp
index c9fdf0f..191636c 100644 (file)
--- a/src/compiler/target-disassem.lisp
+++ b/src/compiler/target-disassem.lisp
@@ -261,7 +261,7 @@
                    (:copier nil))
   (sap-maker (missing-arg)
             :type (function () sb!sys:system-area-pointer))
-  (length 0 :type length)
+  (length 0 :type disassem-length)
   (virtual-location 0 :type address)
   (storage-info nil :type (or null storage-info))
   (code nil :type (or null sb!kernel:code-component))
@@ -853,7 +853,7 @@
                     debug-fun source-form-cache
                     hooks)
   (declare (type (function () sb!sys:system-area-pointer) sap-maker)
-          (type length length)
+          (type disassem-length length)
           (type (or null address) virtual-location)
           (type (or null sb!di:debug-fun) debug-fun)
           (type (or null source-form-cache) source-form-cache))
@@ -1331,7 +1331,7 @@
                          (length (code-inst-area-length code)))
   (declare (type sb!kernel:code-component code)
           (type offset start-offset)
-          (type length length))
+          (type disassem-length length))
   (let ((segments nil))
     (when code
       (let ((fun-map (code-fun-map code))
@@ -1511,7 +1511,7 @@
                           code-component
                           (use-labels t))
   (declare (type (or address sb!sys:system-area-pointer) address)
-          (type length length)
+          (type disassem-length length)
           (type stream stream)
           (type (or null sb!kernel:code-component) code-component)
           (type (member t nil) use-labels))

diff --git a/version.lisp-expr b/version.lisp-expr
index 52221cc..a85530d 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.0.57"
+"0.8.0.58"