From 83097ed630d4efdb79bd0bc91f21014f4365f008 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Tue, 6 May 2008 16:43:52 +0000 Subject: [PATCH] 1.0.16.19: cleanups motivated by clisp host-2 --- src/code/cross-byte.lisp | 5 ----- src/code/gc.lisp | 2 +- src/code/late-extensions.lisp | 2 ++ src/code/win32-pathname.lisp | 2 -- src/compiler/array-tran.lisp | 1 + src/compiler/ir1report.lisp | 6 +++--- version.lisp-expr | 2 +- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/code/cross-byte.lisp b/src/code/cross-byte.lisp index d693a7c..319ad7d 100644 --- a/src/code/cross-byte.lisp +++ b/src/code/cross-byte.lisp @@ -39,11 +39,6 @@ (defun sb!xc:deposit-field (new cross-byte int) (cl:deposit-field new (uncross-byte cross-byte) int)) -(defun sb!c::mask-signed-field (size integer) - (if (logbitp (1- size) integer) - (dpb integer (byte size 0) -1) - (ldb (byte size 0) integer))) - (define-setf-expander sb!xc:ldb (cross-byte int &environment env) (multiple-value-bind (temps vals stores store-form access-form) (get-setf-expansion int env) diff --git a/src/code/gc.lisp b/src/code/gc.lisp index c4f84de..e6abbb1 100644 --- a/src/code/gc.lisp +++ b/src/code/gc.lisp @@ -125,7 +125,7 @@ ;; See comment in interr.lisp *heap-exhausted-error-condition* (make-condition 'heap-exhausted-error))) -(declaim (ftype (function () unsigned-byte) get-bytes-consed)) +(declaim (ftype (sfunction () unsigned-byte) get-bytes-consed)) (defun get-bytes-consed () #!+sb-doc "Return the number of bytes consed since the program began. Typically diff --git a/src/code/late-extensions.lisp b/src/code/late-extensions.lisp index 1918c87..08dbd57 100644 --- a/src/code/late-extensions.lisp +++ b/src/code/late-extensions.lisp @@ -126,6 +126,8 @@ EXPERIMENTAL: Interface subject to change." (macrolet ((def (name lambda-list ref &optional set) `(defun ,name (,@lambda-list old new) #!+compare-and-swap-vops + (declare (ignore ref set)) + #!+compare-and-swap-vops (,name ,@lambda-list old new) #!-compare-and-swap-vops (let ((current (,ref ,@lambda-list))) diff --git a/src/code/win32-pathname.lisp b/src/code/win32-pathname.lisp index e91a7b2..87f8ca8 100644 --- a/src/code/win32-pathname.lisp +++ b/src/code/win32-pathname.lisp @@ -272,8 +272,6 @@ (type (pathname-type pathname)) (type-present-p (typep type '(not (member nil :unspecific)))) (type-string (if type-present-p type ""))) - (when name-present-p - (setf as-file nil)) (coerce (with-output-to-string (s) (when device diff --git a/src/compiler/array-tran.lisp b/src/compiler/array-tran.lisp index 9762e0c..a57dc93 100644 --- a/src/compiler/array-tran.lisp +++ b/src/compiler/array-tran.lisp @@ -827,6 +827,7 @@ ;;; available, switch back to the normal one to give other transforms ;;; a stab at it. (macrolet ((define (name transform-to extra extra-type) + (declare (ignore extra-type)) `(deftransform ,name ((array index ,@extra)) (let ((type (lvar-type array)) (element-type (extract-upgraded-element-type array))) diff --git a/src/compiler/ir1report.lisp b/src/compiler/ir1report.lisp index 0a90d60..f621c93 100644 --- a/src/compiler/ir1report.lisp +++ b/src/compiler/ir1report.lisp @@ -399,10 +399,10 @@ has written, having proved that it is unreachable.")) (values)) ;; Issue a note when we might or might not be in the compiler. - (defun maybe-compiler-notify (&rest rest) + (defun maybe-compiler-notify (datum &rest args) (if (boundp '*lexenv*) ; if we're in the compiler - (apply #'compiler-notify rest) - (with-condition (condition (car rest) (cdr rest)) + (apply #'compiler-notify datum args) + (with-condition (condition datum args) (let ((stream *error-output*)) (pprint-logical-block (stream nil :per-line-prefix ";") (format stream " note: ~3I~_") diff --git a/version.lisp-expr b/version.lisp-expr index f934dbf..bc04053 100644 --- 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".) -"1.0.16.18" +"1.0.16.19" -- 1.7.10.4