From: Douglas K. <sn...@us...> - 2014-05-27 16:44:49
|
The branch "master" has been updated in SBCL: via a94bfc03aa63115920d3fa6f88731b5feb0ae330 (commit) from 542bfd9505504716199b1bef9db4eaf10f54dbaa (commit) - Log ----------------------------------------------------------------- commit a94bfc03aa63115920d3fa6f88731b5feb0ae330 Author: Douglas Katzman <do...@go...> Date: Tue May 27 12:33:26 2014 -0400 Use %OTHER-POINTER-WIDETAG instead of WIDETAG-OF where applicable. Also strengthen a declaration in DUMP-SPECIALIZED-VECTOR. --- src/code/array.lisp | 10 +++++----- src/compiler/dump.lisp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/code/array.lisp b/src/code/array.lisp index f2846ab..65cf86d 100644 --- a/src/code/array.lisp +++ b/src/code/array.lisp @@ -340,10 +340,10 @@ ,sb!vm:complex-array-widetag) (with-array-data ((array array) (start) (end)) (declare (ignore start end)) - (widetag-of array))) + (%other-pointer-widetag array))) (t widetag)))) - (let ((widetag (widetag-of array))) + (let ((widetag (%other-pointer-widetag array))) (make-case)))) ;;; Widetag is the widetag of the underlying vector, @@ -851,7 +851,7 @@ of specialized arrays is supported." (defun array-element-type (array) #!+sb-doc "Return the type of the elements of the array" - (let ((widetag (widetag-of array))) + (let ((widetag (%other-pointer-widetag array))) (macrolet ((pick-element-type (&rest stuff) `(cond ,@(mapcar (lambda (stuff) (cons @@ -1130,7 +1130,7 @@ of specialized arrays is supported." (setf new-data (data-vector-from-inits dimensions new-length element-type - (widetag-of old-data) nil + (%other-pointer-widetag old-data) nil initial-contents initial-contents-p initial-element initial-element-p)) ;; Provide :END1 to avoid full call to LENGTH @@ -1159,7 +1159,7 @@ of specialized arrays is supported." (data-vector-from-inits dimensions new-length element-type - (widetag-of old-data) nil + (%other-pointer-widetag old-data) nil () nil initial-element initial-element-p) old-data))) diff --git a/src/compiler/dump.lisp b/src/compiler/dump.lisp index 85ccf57..cf89656 100644 --- a/src/compiler/dump.lisp +++ b/src/compiler/dump.lisp @@ -829,9 +829,9 @@ #-sb-xc-host (defun dump-specialized-vector (vector file &key data-only) - (declare (type (simple-array * (*)) vector)) + (declare (type (simple-unboxed-array (*)) vector)) (let* ((length (length vector)) - (widetag (widetag-of vector)) + (widetag (%other-pointer-widetag vector)) (bits-per-length (aref **saetp-bits-per-length** widetag))) (aver (< bits-per-length 255)) (unless data-only ----------------------------------------------------------------------- hooks/post-receive -- SBCL |