remove misplaced AVER

[sbcl.git] / src / code / array.lisp

diff --git a/src/code/array.lisp b/src/code/array.lisp
index f463c5f..02425d1 100644 (file)
--- a/src/code/array.lisp
+++ b/src/code/array.lisp
@@ -12,25 +12,26 @@
 (in-package "SB!IMPL")
 
 #!-sb-fluid
 (in-package "SB!IMPL")
 
 #!-sb-fluid

-(declaim (inline fill-pointer array-has-fill-pointer-p adjustable-array-p
-                array-displacement))
+(declaim (inline adjustable-array-p
+                 array-displacement))

 \f
 ;;;; miscellaneous accessor functions
 
 ;;; These functions are only needed by the interpreter, 'cause the
 ;;; compiler inlines them.
 (macrolet ((def (name)
 \f
 ;;;; miscellaneous accessor functions
 
 ;;; These functions are only needed by the interpreter, 'cause the
 ;;; compiler inlines them.
 (macrolet ((def (name)

-            `(progn
-               (defun ,name (array)
-                 (,name array))
-               (defun (setf ,name) (value array)
-                 (setf (,name array) value)))))
+             `(progn
+                (defun ,name (array)
+                  (,name array))
+                (defun (setf ,name) (value array)
+                  (setf (,name array) value)))))

   (def %array-fill-pointer)
   (def %array-fill-pointer-p)
   (def %array-available-elements)
   (def %array-data-vector)
   (def %array-displacement)
   (def %array-fill-pointer)
   (def %array-fill-pointer-p)
   (def %array-available-elements)
   (def %array-data-vector)
   (def %array-displacement)

-  (def %array-displaced-p))
+  (def %array-displaced-p)
+  (def %array-diplaced-from))

 
 (defun %array-rank (array)
   (%array-rank array))
 
 (defun %array-rank (array)
   (%array-rank array))

@@ -43,11 +44,14 @@
 
 (defun %check-bound (array bound index)
   (declare (type index bound)
 
 (defun %check-bound (array bound index)
   (declare (type index bound)

-          (fixnum index))
+           (fixnum index))

   (%check-bound array bound index))
 
   (%check-bound array bound index))
 

+(defun %with-array-data/fp (array start end)
+  (%with-array-data-macro array start end :check-bounds t :check-fill-pointer t))
+

 (defun %with-array-data (array start end)
 (defun %with-array-data (array start end)

-  (%with-array-data-macro array start end :fail-inline? t))
+  (%with-array-data-macro array start end :check-bounds t :check-fill-pointer nil))

 
 (defun %data-vector-and-index (array index)
   (if (array-header-p array)
 
 (defun %data-vector-and-index (array index)
   (if (array-header-p array)

@@ -55,24 +59,16 @@
           (%with-array-data array index nil)
         (values vector index))
       (values array index)))
           (%with-array-data array index nil)
         (values vector index))
       (values array index)))

-
-;;; It'd waste space to expand copies of error handling in every
-;;; inline %WITH-ARRAY-DATA, so we have them call this function
-;;; instead. This is just a wrapper which is known never to return.
-(defun failed-%with-array-data (array start end)
-  (declare (notinline %with-array-data))
-  (%with-array-data array start end)
-  (bug "called FAILED-%WITH-ARRAY-DATA with valid array parameters?"))

 \f
 ;;;; MAKE-ARRAY
 (eval-when (:compile-toplevel :execute)
   (sb!xc:defmacro pick-vector-type (type &rest specs)
     `(cond ,@(mapcar (lambda (spec)
 \f
 ;;;; MAKE-ARRAY
 (eval-when (:compile-toplevel :execute)
   (sb!xc:defmacro pick-vector-type (type &rest specs)
     `(cond ,@(mapcar (lambda (spec)

-                      `(,(if (eq (car spec) t)
-                             t
-                             `(subtypep ,type ',(car spec)))
-                        ,@(cdr spec)))
-                    specs))))
+                       `(,(if (eq (car spec) t)
+                              t
+                              `(subtypep ,type ',(car spec)))
+                         ,@(cdr spec)))
+                     specs))))

 
 ;;; These functions are used in the implementation of MAKE-ARRAY for
 ;;; complex arrays. There are lots of transforms to simplify
 
 ;;; These functions are used in the implementation of MAKE-ARRAY for
 ;;; complex arrays. There are lots of transforms to simplify

@@ -91,27 +87,35 @@
     ;; and for all in any reasonable user programs.)
     ((t)
      (values #.sb!vm:simple-vector-widetag #.sb!vm:n-word-bits))
     ;; and for all in any reasonable user programs.)
     ((t)
      (values #.sb!vm:simple-vector-widetag #.sb!vm:n-word-bits))

-    ((base-char standard-char character)
+    ((base-char standard-char #!-sb-unicode character)

      (values #.sb!vm:simple-base-string-widetag #.sb!vm:n-byte-bits))
      (values #.sb!vm:simple-base-string-widetag #.sb!vm:n-byte-bits))

+    #!+sb-unicode
+    ((character)
+     (values #.sb!vm:simple-character-string-widetag #.sb!vm:n-word-bits))

     ((bit)
      (values #.sb!vm:simple-bit-vector-widetag 1))
     ;; OK, we have to wade into SUBTYPEPing after all.
     (t
     ((bit)
      (values #.sb!vm:simple-bit-vector-widetag 1))
     ;; OK, we have to wade into SUBTYPEPing after all.
     (t

+     (unless *type-system-initialized*
+       (bug "SUBTYPEP dispatch for MAKE-ARRAY before the type system is ready"))

      #.`(pick-vector-type type
      #.`(pick-vector-type type

-        ,@(map 'list
-               (lambda (saetp)
-                 `(,(sb!vm:saetp-specifier saetp)
-                   (values ,(sb!vm:saetp-typecode saetp)
-                           ,(sb!vm:saetp-n-bits saetp))))
-               sb!vm:*specialized-array-element-type-properties*)))))
+         ,@(map 'list
+                (lambda (saetp)
+                  `(,(sb!vm:saetp-specifier saetp)
+                    (values ,(sb!vm:saetp-typecode saetp)
+                            ,(sb!vm:saetp-n-bits saetp))))
+                sb!vm:*specialized-array-element-type-properties*)))))

 
 (defun %complex-vector-widetag (type)
   (case type
     ;; Pick off some easy common cases.
     ((t)
      #.sb!vm:complex-vector-widetag)
 
 (defun %complex-vector-widetag (type)
   (case type
     ;; Pick off some easy common cases.
     ((t)
      #.sb!vm:complex-vector-widetag)

-    ((base-char character)
+    ((base-char #!-sb-unicode character)

      #.sb!vm:complex-base-string-widetag)
      #.sb!vm:complex-base-string-widetag)

+    #!+sb-unicode
+    ((character)
+     #.sb!vm:complex-character-string-widetag)

     ((nil)
      #.sb!vm:complex-vector-nil-widetag)
     ((bit)
     ((nil)
      #.sb!vm:complex-vector-nil-widetag)
     ((bit)

@@ -120,44 +124,69 @@
     (t
      (pick-vector-type type
        (nil #.sb!vm:complex-vector-nil-widetag)
     (t
      (pick-vector-type type
        (nil #.sb!vm:complex-vector-nil-widetag)

+       #!-sb-unicode

        (character #.sb!vm:complex-base-string-widetag)
        (character #.sb!vm:complex-base-string-widetag)

+       #!+sb-unicode
+       (base-char #.sb!vm:complex-base-string-widetag)
+       #!+sb-unicode
+       (character #.sb!vm:complex-character-string-widetag)

        (bit #.sb!vm:complex-bit-vector-widetag)
        (t #.sb!vm:complex-vector-widetag)))))
 
        (bit #.sb!vm:complex-bit-vector-widetag)
        (t #.sb!vm:complex-vector-widetag)))))
 

+(defglobal %%simple-array-n-bits%% (make-array (1+ sb!vm:widetag-mask)))
+#.(loop for info across sb!vm:*specialized-array-element-type-properties*
+        collect `(setf (aref %%simple-array-n-bits%% ,(sb!vm:saetp-typecode info))
+                       ,(sb!vm:saetp-n-bits info)) into forms
+        finally (return `(progn ,@forms)))
+
+(defun allocate-vector-with-widetag (widetag length &optional n-bits)
+  (declare (type (unsigned-byte 8) widetag)
+           (type index length))
+  (let ((n-bits (or n-bits (aref %%simple-array-n-bits%% widetag))))
+    (declare (type (integer 0 256) n-bits))
+    (allocate-vector widetag length
+                     (ceiling
+                      (* (if (or (= widetag sb!vm:simple-base-string-widetag)
+                                 #!+sb-unicode
+                                 (= widetag
+                                    sb!vm:simple-character-string-widetag))
+                             (1+ length)
+                             length)
+                         n-bits)
+                      sb!vm:n-word-bits))))
+

 (defun make-array (dimensions &key
 (defun make-array (dimensions &key

-                             (element-type t)
-                             (initial-element nil initial-element-p)
-                             (initial-contents nil initial-contents-p)
+                              (element-type t)
+                              (initial-element nil initial-element-p)
+                              (initial-contents nil initial-contents-p)

                               adjustable fill-pointer
                               adjustable fill-pointer

-                             displaced-to displaced-index-offset)
+                              displaced-to displaced-index-offset)

   (let* ((dimensions (if (listp dimensions) dimensions (list dimensions)))
   (let* ((dimensions (if (listp dimensions) dimensions (list dimensions)))

-        (array-rank (length (the list dimensions)))
-        (simple (and (null fill-pointer)
-                     (not adjustable)
-                     (null displaced-to))))
+         (array-rank (length (the list dimensions)))
+         (simple (and (null fill-pointer)
+                      (not adjustable)
+                      (null displaced-to))))

     (declare (fixnum array-rank))
     (when (and displaced-index-offset (null displaced-to))
       (error "can't specify :DISPLACED-INDEX-OFFSET without :DISPLACED-TO"))
     (declare (fixnum array-rank))
     (when (and displaced-index-offset (null displaced-to))
       (error "can't specify :DISPLACED-INDEX-OFFSET without :DISPLACED-TO"))

+    (when (and displaced-to
+               (arrayp displaced-to)
+               (not (equal (array-element-type displaced-to)
+                           (upgraded-array-element-type element-type))))
+      (error "Array element type of :DISPLACED-TO array does not match specified element type"))

     (if (and simple (= array-rank 1))
     (if (and simple (= array-rank 1))

-       ;; it's a (SIMPLE-ARRAY * (*))
-       (multiple-value-bind (type n-bits)
-           (%vector-widetag-and-n-bits element-type)
-         (declare (type (unsigned-byte 8) type)
-                  (type (integer 0 256) n-bits))
-         (let* ((length (car dimensions))
-                (array (allocate-vector
-                        type
-                        length
-                        (ceiling (* (if (= type sb!vm:simple-base-string-widetag)
-                                        (1+ length)
-                                        length)
-                                    n-bits)
-                                 sb!vm:n-word-bits))))
-           (declare (type index length))
-           (when initial-element-p
-             (fill array initial-element))
-           (when initial-contents-p
-             (when initial-element-p
+        ;; it's a (SIMPLE-ARRAY * (*))
+        (multiple-value-bind (type n-bits)
+            (%vector-widetag-and-n-bits element-type)
+          (declare (type (unsigned-byte 8) type)
+                   (type (integer 0 256) n-bits))
+          (let* ((length (car dimensions))
+                 (array (allocate-vector-with-widetag type length n-bits)))
+            (declare (type index length))
+            (when initial-element-p
+              (fill array initial-element))
+            (when initial-contents-p
+              (when initial-element-p

                 (error "can't specify both :INITIAL-ELEMENT and ~
                        :INITIAL-CONTENTS"))
               (unless (= length (length initial-contents))
                 (error "can't specify both :INITIAL-ELEMENT and ~
                        :INITIAL-CONTENTS"))
               (unless (= length (length initial-contents))

@@ -165,130 +194,301 @@
                        the vector length is ~W."
                        (length initial-contents)
                        length))
                        the vector length is ~W."
                        (length initial-contents)
                        length))

-             (replace array initial-contents))
-           array))
-       ;; it's either a complex array or a multidimensional array.
-       (let* ((total-size (reduce #'* dimensions))
-              (data (or displaced-to
-                        (data-vector-from-inits
-                         dimensions total-size element-type
-                         initial-contents initial-contents-p
+              (replace array initial-contents))
+            array))
+        ;; it's either a complex array or a multidimensional array.
+        (let* ((total-size (reduce #'* dimensions))
+               (data (or displaced-to
+                         (data-vector-from-inits
+                          dimensions total-size element-type nil
+                          initial-contents initial-contents-p

                           initial-element initial-element-p)))
                           initial-element initial-element-p)))

-              (array (make-array-header
-                      (cond ((= array-rank 1)
-                             (%complex-vector-widetag element-type))
-                            (simple sb!vm:simple-array-widetag)
-                            (t sb!vm:complex-array-widetag))
-                      array-rank)))
-         (cond (fill-pointer
-                (unless (= array-rank 1)
-                  (error "Only vectors can have fill pointers."))
-                (let ((length (car dimensions)))
-                  (declare (fixnum length))
-                  (setf (%array-fill-pointer array)
-                    (cond ((eq fill-pointer t)
-                           length)
-                          (t
-                           (unless (and (fixnump fill-pointer)
-                                        (>= fill-pointer 0)
-                                        (<= fill-pointer length))
-                             ;; FIXME: should be TYPE-ERROR?
-                             (error "invalid fill-pointer ~W"
-                                    fill-pointer))
-                           fill-pointer))))
-                (setf (%array-fill-pointer-p array) t))
-               (t
-                (setf (%array-fill-pointer array) total-size)
-                (setf (%array-fill-pointer-p array) nil)))
-         (setf (%array-available-elements array) total-size)
-         (setf (%array-data-vector array) data)
-         (cond (displaced-to
-                (when (or initial-element-p initial-contents-p)
-                  (error "Neither :INITIAL-ELEMENT nor :INITIAL-CONTENTS ~
+               (array (make-array-header
+                       (cond ((= array-rank 1)
+                              (%complex-vector-widetag element-type))
+                             (simple sb!vm:simple-array-widetag)
+                             (t sb!vm:complex-array-widetag))
+                       array-rank)))
+          (cond (fill-pointer
+                 (unless (= array-rank 1)
+                   (error "Only vectors can have fill pointers."))
+                 (let ((length (car dimensions)))
+                   (declare (fixnum length))
+                   (setf (%array-fill-pointer array)
+                     (cond ((eq fill-pointer t)
+                            length)
+                           (t
+                            (unless (and (fixnump fill-pointer)
+                                         (>= fill-pointer 0)
+                                         (<= fill-pointer length))
+                              ;; FIXME: should be TYPE-ERROR?
+                              (error "invalid fill-pointer ~W"
+                                     fill-pointer))
+                            fill-pointer))))
+                 (setf (%array-fill-pointer-p array) t))
+                (t
+                 (setf (%array-fill-pointer array) total-size)
+                 (setf (%array-fill-pointer-p array) nil)))
+          (setf (%array-available-elements array) total-size)
+          (setf (%array-data-vector array) data)
+          (setf (%array-displaced-from array) nil)
+          (cond (displaced-to
+                 (when (or initial-element-p initial-contents-p)
+                   (error "Neither :INITIAL-ELEMENT nor :INITIAL-CONTENTS ~

                    can be specified along with :DISPLACED-TO"))
                    can be specified along with :DISPLACED-TO"))

-                (let ((offset (or displaced-index-offset 0)))
-                  (when (> (+ offset total-size)
-                           (array-total-size displaced-to))
-                    (error "~S doesn't have enough elements." displaced-to))
-                  (setf (%array-displacement array) offset)
-                  (setf (%array-displaced-p array) t)))
-               (t
-                (setf (%array-displaced-p array) nil)))
-         (let ((axis 0))
-           (dolist (dim dimensions)
-             (setf (%array-dimension array axis) dim)
-             (incf axis)))
-         array))))
+                 (let ((offset (or displaced-index-offset 0)))
+                   (when (> (+ offset total-size)
+                            (array-total-size displaced-to))
+                     (error "~S doesn't have enough elements." displaced-to))
+                   (setf (%array-displacement array) offset)
+                   (setf (%array-displaced-p array) t)
+                   (%save-displaced-array-backpointer array data)))
+                (t
+                 (setf (%array-displaced-p array) nil)))
+          (let ((axis 0))
+            (dolist (dim dimensions)
+              (setf (%array-dimension array axis) dim)
+              (incf axis)))
+          array))))
+
+(defun make-static-vector (length &key
+                           (element-type '(unsigned-byte 8))
+                           (initial-contents nil initial-contents-p)
+                           (initial-element nil initial-element-p))
+  "Allocate vector of LENGTH elements in static space. Only allocation
+of specialized arrays is supported."
+  ;; STEP 1: check inputs fully
+  ;;
+  ;; This way of doing explicit checks before the vector is allocated
+  ;; is expensive, but probably worth the trouble as once we've allocated
+  ;; the vector we have no way to get rid of it anymore...
+  (when (eq t (upgraded-array-element-type element-type))
+    (error "Static arrays of type ~S not supported."
+           element-type))
+  (when initial-contents-p
+    (when initial-element-p
+      (error "can't specify both :INITIAL-ELEMENT and :INITIAL-CONTENTS"))
+    (unless (= length (length initial-contents))
+      (error "There are ~W elements in the :INITIAL-CONTENTS, but the ~
+              vector length is ~W."
+             (length initial-contents)
+             length))
+    (unless (every (lambda (x) (typep x element-type)) initial-contents)
+      (error ":INITIAL-CONTENTS contains elements not of type ~S."
+             element-type)))
+  (when initial-element-p
+    (unless (typep initial-element element-type)
+      (error ":INITIAL-ELEMENT ~S is not of type ~S."
+             initial-element element-type)))
+  ;; STEP 2
+  ;;
+  ;; Allocate and possibly initialize the vector.
+  (multiple-value-bind (type n-bits)
+      (sb!impl::%vector-widetag-and-n-bits element-type)
+    (let ((vector
+           (allocate-static-vector type length
+                                   (ceiling (* length n-bits)
+                                            sb!vm:n-word-bits))))
+      (cond (initial-element-p
+             (fill vector initial-element))
+            (initial-contents-p
+             (replace vector initial-contents))
+            (t
+             vector)))))

 
 ;;; DATA-VECTOR-FROM-INITS returns a simple vector that has the
 ;;; specified array characteristics. Dimensions is only used to pass
 ;;; to FILL-DATA-VECTOR for error checking on the structure of
 ;;; initial-contents.
 
 ;;; DATA-VECTOR-FROM-INITS returns a simple vector that has the
 ;;; specified array characteristics. Dimensions is only used to pass
 ;;; to FILL-DATA-VECTOR for error checking on the structure of
 ;;; initial-contents.

-(defun data-vector-from-inits (dimensions total-size element-type
-                              initial-contents initial-contents-p
+(defun data-vector-from-inits (dimensions total-size
+                               element-type widetag
+                               initial-contents initial-contents-p

                                initial-element initial-element-p)
                                initial-element initial-element-p)

-  (when (and initial-contents-p initial-element-p)
-    (error "cannot supply both :INITIAL-CONTENTS and :INITIAL-ELEMENT to
+  (when initial-element-p
+    (when initial-contents-p
+      (error "cannot supply both :INITIAL-CONTENTS and :INITIAL-ELEMENT to

             either MAKE-ARRAY or ADJUST-ARRAY."))
             either MAKE-ARRAY or ADJUST-ARRAY."))

-  (let ((data (if initial-element-p
-                 (make-array total-size
-                             :element-type element-type
-                             :initial-element initial-element)
-                 (make-array total-size
-                             :element-type element-type))))
+    (unless (typep initial-element element-type)
+      (error "~S cannot be used to initialize an array of type ~S."
+             initial-element element-type)))
+  (let ((data (if widetag
+                  (allocate-vector-with-widetag widetag total-size)
+                  (make-array total-size :element-type element-type))))

     (cond (initial-element-p
     (cond (initial-element-p

-          (unless (simple-vector-p data)
-            (unless (typep initial-element element-type)
-              (error "~S cannot be used to initialize an array of type ~S."
-                     initial-element element-type))
-            (fill (the vector data) initial-element)))
-         (initial-contents-p
-          (fill-data-vector data dimensions initial-contents)))
+           (fill (the vector data) initial-element))
+          (initial-contents-p
+           (fill-data-vector data dimensions initial-contents)))

     data))
 
     data))
 

-(defun fill-data-vector (vector dimensions initial-contents)
-  (let ((index 0))
-    (labels ((frob (axis dims contents)
-              (cond ((null dims)
-                     (setf (aref vector index) contents)
-                     (incf index))
-                    (t
-                     (unless (typep contents 'sequence)
-                        (error "malformed :INITIAL-CONTENTS: ~S is not a ~
-                                sequence, but ~W more layer~:P needed."
-                              contents
-                              (- (length dimensions) axis)))
-                     (unless (= (length contents) (car dims))
-                        (error "malformed :INITIAL-CONTENTS: Dimension of ~
-                                axis ~W is ~W, but ~S is ~W long."
-                              axis (car dims) contents (length contents)))
-                     (if (listp contents)
-                         (dolist (content contents)
-                           (frob (1+ axis) (cdr dims) content))
-                         (dotimes (i (length contents))
-                           (frob (1+ axis) (cdr dims) (aref contents i))))))))
-      (frob 0 dimensions initial-contents))))
-

 (defun vector (&rest objects)
   #!+sb-doc
   "Construct a SIMPLE-VECTOR from the given objects."
   (coerce (the list objects) 'simple-vector))
 \f
 (defun vector (&rest objects)
   #!+sb-doc
   "Construct a SIMPLE-VECTOR from the given objects."
   (coerce (the list objects) 'simple-vector))
 \f

+

 ;;;; accessor/setter functions
 ;;;; accessor/setter functions

-(defun hairy-data-vector-ref (array index)
-  (with-array-data ((vector array) (index index) (end))
-    (declare (ignore end))
-    (etypecase vector .
-              #.(map 'list
-                     (lambda (saetp)
-                       (let* ((type (sb!vm:saetp-specifier saetp))
-                              (atype `(simple-array ,type (*))))
-                         `(,atype
-                           (data-vector-ref (the ,atype vector) index))))
-                     (sort
-                      (copy-seq
-                       sb!vm:*specialized-array-element-type-properties*)
-                      #'> :key #'sb!vm:saetp-importance)))))
+
+;;; Dispatch to an optimized routine the data vector accessors for
+;;; each different specialized vector type. Do dispatching by looking
+;;; up the widetag in the array rather than with the typecases, which
+;;; as of 1.0.5 compiles to a naive sequence of linear TYPEPs. Also
+;;; provide separate versions where bounds checking has been moved
+;;; from the callee to the caller, since it's much cheaper to do once
+;;; the type information is available. Finally, for each of these
+;;; routines also provide a slow path, taken for arrays that are not
+;;; vectors or not simple.
+(macrolet ((def (name table-name)
+             `(progn
+                (defglobal ,table-name (make-array ,(1+ sb!vm:widetag-mask)))
+                (defmacro ,name (array-var)
+                  `(the function
+                     (let ((tag 0))
+                       (when (sb!vm::%other-pointer-p ,array-var)
+                         (setf tag (%other-pointer-widetag ,array-var)))
+                       (svref ,',table-name tag)))))))
+  (def !find-data-vector-setter %%data-vector-setters%%)
+  (def !find-data-vector-setter/check-bounds %%data-vector-setters/check-bounds%%)
+  ;; Used by DO-VECTOR-DATA -- which in turn appears in DOSEQUENCE expansion,
+  ;; meaning we can have post-build dependences on this.
+  (def %find-data-vector-reffer %%data-vector-reffers%%)
+  (def !find-data-vector-reffer/check-bounds %%data-vector-reffers/check-bounds%%))
+
+;;; Like DOVECTOR, but more magical -- can't use this on host.
+(defmacro do-vector-data ((elt vector &optional result) &body body)
+  (multiple-value-bind (forms decls) (parse-body body :doc-string-allowed nil)
+    (with-unique-names (index vec start end ref)
+      `(with-array-data ((,vec ,vector)
+                         (,start)
+                         (,end)
+                         :check-fill-pointer t)
+         (let ((,ref (%find-data-vector-reffer ,vec)))
+           (do ((,index ,start (1+ ,index)))
+               ((>= ,index ,end)
+                (let ((,elt nil))
+                  ,@(filter-dolist-declarations decls)
+                  ,elt
+                  ,result))
+             (let ((,elt (funcall ,ref ,vec ,index)))
+               ,@decls
+               (tagbody ,@forms))))))))
+
+(macrolet ((%ref (accessor-getter extra-params)
+             `(funcall (,accessor-getter array) array index ,@extra-params))
+           (define (accessor-name slow-accessor-name accessor-getter
+                                  extra-params check-bounds)
+             `(progn
+                (defun ,accessor-name (array index ,@extra-params)
+                  (declare (optimize speed
+                                     ;; (SAFETY 0) is ok. All calls to
+                                     ;; these functions are generated by
+                                     ;; the compiler, so argument count
+                                     ;; checking isn't needed. Type checking
+                                     ;; is done implicitly via the widetag
+                                     ;; dispatch.
+                                     (safety 0)))
+                  (%ref ,accessor-getter ,extra-params))
+                (defun ,slow-accessor-name (array index ,@extra-params)
+                  (declare (optimize speed (safety 0)))
+                  (if (not (%array-displaced-p array))
+                      ;; The reasonably quick path of non-displaced complex
+                      ;; arrays.
+                      (let ((array (%array-data-vector array)))
+                        (%ref ,accessor-getter ,extra-params))
+                      ;; The real slow path.
+                      (with-array-data
+                          ((vector array)
+                           (index (locally
+                                      (declare (optimize (speed 1) (safety 1)))
+                                    (,@check-bounds index)))
+                           (end)
+                           :force-inline t)
+                        (declare (ignore end))
+                        (,accessor-name vector index ,@extra-params)))))))
+  (define hairy-data-vector-ref slow-hairy-data-vector-ref
+    %find-data-vector-reffer
+    nil (progn))
+  (define hairy-data-vector-set slow-hairy-data-vector-set
+    !find-data-vector-setter
+    (new-value) (progn))
+  (define hairy-data-vector-ref/check-bounds
+      slow-hairy-data-vector-ref/check-bounds
+    !find-data-vector-reffer/check-bounds
+    nil (%check-bound array (array-dimension array 0)))
+  (define hairy-data-vector-set/check-bounds
+      slow-hairy-data-vector-set/check-bounds
+    !find-data-vector-setter/check-bounds
+    (new-value) (%check-bound array (array-dimension array 0))))
+
+(defun hairy-ref-error (array index &optional new-value)
+  (declare (ignore index new-value))
+  (error 'type-error
+         :datum array
+         :expected-type 'vector))
+
+(macrolet ((define-reffer (saetp check-form)
+             (let* ((type (sb!vm:saetp-specifier saetp))
+                    (atype `(simple-array ,type (*))))
+               `(named-lambda optimized-data-vector-ref (vector index)
+                  (declare (optimize speed (safety 0)))
+                  (data-vector-ref (the ,atype vector)
+                                   (locally
+                                       (declare (optimize (safety 1)))
+                                     (the index
+                                       (,@check-form index)))))))
+           (define-setter (saetp check-form)
+             (let* ((type (sb!vm:saetp-specifier saetp))
+                    (atype `(simple-array ,type (*))))
+               `(named-lambda optimized-data-vector-set (vector index new-value)
+                  (declare (optimize speed (safety 0)))
+                  (data-vector-set (the ,atype vector)
+                                   (locally
+                                       (declare (optimize (safety 1)))
+                                     (the index
+                                       (,@check-form index)))
+                                   (locally
+                                       ;; SPEED 1 needed to avoid the compiler
+                                       ;; from downgrading the type check to
+                                       ;; a cheaper one.
+                                       (declare (optimize (speed 1)
+                                                          (safety 1)))
+                                     (the ,type new-value)))
+                  ;; For specialized arrays, the return from
+                  ;; data-vector-set would have to be reboxed to be a
+                  ;; (Lisp) return value; instead, we use the
+                  ;; already-boxed value as the return.
+                  new-value)))
+           (define-reffers (symbol deffer check-form slow-path)
+             `(progn
+                ;; FIXME/KLUDGE: can't just FILL here, because genesis doesn't
+                ;; preserve the binding, so re-initiaize as NS doesn't have
+                ;; the energy to figure out to change that right now.
+                (setf ,symbol (make-array (1+ sb!vm::widetag-mask)
+                                          :initial-element #'hairy-ref-error))
+                ,@(loop for widetag in '(sb!vm:complex-vector-widetag
+                                         sb!vm:complex-vector-nil-widetag
+                                         sb!vm:complex-bit-vector-widetag
+                                         #!+sb-unicode sb!vm:complex-character-string-widetag
+                                         sb!vm:complex-base-string-widetag
+                                         sb!vm:simple-array-widetag
+                                         sb!vm:complex-array-widetag)
+                        collect `(setf (svref ,symbol ,widetag) ,slow-path))
+                ,@(loop for saetp across sb!vm:*specialized-array-element-type-properties*
+                        for widetag = (sb!vm:saetp-typecode saetp)
+                        collect `(setf (svref ,symbol ,widetag)
+                                       (,deffer ,saetp ,check-form))))))
+  (defun !hairy-data-vector-reffer-init ()
+    (define-reffers %%data-vector-reffers%% define-reffer
+      (progn)
+      #'slow-hairy-data-vector-ref)
+    (define-reffers %%data-vector-setters%% define-setter
+      (progn)
+      #'slow-hairy-data-vector-set)
+    (define-reffers %%data-vector-reffers/check-bounds%% define-reffer
+      (%check-bound vector (length vector))
+      #'slow-hairy-data-vector-ref/check-bounds)
+    (define-reffers %%data-vector-setters/check-bounds%% define-setter
+      (%check-bound vector (length vector))
+      #'slow-hairy-data-vector-set/check-bounds)))

 
 ;;; (Ordinary DATA-VECTOR-REF usage compiles into a vop, but
 ;;; DATA-VECTOR-REF is also FOLDABLE, and this ordinary function
 
 ;;; (Ordinary DATA-VECTOR-REF usage compiles into a vop, but
 ;;; DATA-VECTOR-REF is also FOLDABLE, and this ordinary function

@@ -296,126 +496,101 @@
 (defun data-vector-ref (array index)
   (hairy-data-vector-ref array index))
 
 (defun data-vector-ref (array index)
   (hairy-data-vector-ref array index))
 

-(defun hairy-data-vector-set (array index new-value)
-  (with-array-data ((vector array) (index index) (end))
-    (declare (ignore end))
-    (etypecase vector .
-              #.(map 'list
-                     (lambda (saetp)
-                       (let* ((type (sb!vm:saetp-specifier saetp))
-                              (atype `(simple-array ,type (*))))
-                         `(,atype
-                           (data-vector-set (the ,atype vector) index
-                                            (the ,type new-value))
-                           ;; For specialized arrays, the return from
-                           ;; data-vector-set would have to be
-                           ;; reboxed to be a (Lisp) return value;
-                           ;; instead, we use the already-boxed value
-                           ;; as the return.
-                           new-value)))
-                     (sort
-                      (copy-seq
-                       sb!vm:*specialized-array-element-type-properties*)
-                      #'> :key #'sb!vm:saetp-importance)))))
-
+(defun data-vector-ref-with-offset (array index offset)
+  (hairy-data-vector-ref array (+ index offset)))
+
+(defun invalid-array-p (array)
+  (and (array-header-p array)
+       (consp (%array-displaced-p array))))
+
+(declaim (ftype (function (array) nil) invalid-array-error))
+(defun invalid-array-error (array)
+  (aver (array-header-p array))
+  ;; Array invalidation stashes the original dimensions here...
+  (let ((dims (%array-displaced-p array))
+        (et (array-element-type array)))
+    (error 'invalid-array-error
+           :datum array
+           :expected-type
+           (if (cdr dims)
+               `(array ,et ,dims)
+               `(vector ,et ,@dims)))))
+
+(declaim (ftype (function (array integer integer &optional t) nil)
+                invalid-array-index-error))
+(defun invalid-array-index-error (array index bound &optional axis)
+  (if (invalid-array-p array)
+      (invalid-array-error array)
+      (error 'invalid-array-index-error
+             :array array
+             :axis axis
+             :datum index
+             :expected-type `(integer 0 (,bound)))))
+
+;;; SUBSCRIPTS has a dynamic-extent list structure and is destroyed

 (defun %array-row-major-index (array subscripts
 (defun %array-row-major-index (array subscripts

-                                    &optional (invalid-index-error-p t))
+                                     &optional (invalid-index-error-p t))

   (declare (array array)
   (declare (array array)

-          (list subscripts))
+           (list subscripts))

   (let ((rank (array-rank array)))
     (unless (= rank (length subscripts))
       (error "wrong number of subscripts, ~W, for array of rank ~W"
   (let ((rank (array-rank array)))
     (unless (= rank (length subscripts))
       (error "wrong number of subscripts, ~W, for array of rank ~W"

-            (length subscripts) rank))
+             (length subscripts) rank))

     (if (array-header-p array)
     (if (array-header-p array)

-       (do ((subs (nreverse subscripts) (cdr subs))
-            (axis (1- (array-rank array)) (1- axis))
-            (chunk-size 1)
-            (result 0))
-           ((null subs) result)
-         (declare (list subs) (fixnum axis chunk-size result))
-         (let ((index (car subs))
-               (dim (%array-dimension array axis)))
-           (declare (fixnum dim))
-           (unless (and (fixnump index) (< -1 index dim))
-             (if invalid-index-error-p
-                 (error 'simple-type-error
-                        :format-control "invalid index ~W~[~;~:; on axis ~:*~W~] in ~S"
-                        :format-arguments (list index axis array)
-                        :datum index
-                        :expected-type `(integer 0 (,dim)))
-                 (return-from %array-row-major-index nil)))
-           (incf result (* chunk-size (the fixnum index)))
-           (setf chunk-size (* chunk-size dim))))
-       (let ((index (first subscripts))
-             (length (length (the (simple-array * (*)) array))))
-         (unless (and (fixnump index) (< -1 index length))
-           (if invalid-index-error-p
-               ;; FIXME: perhaps this should share a format-string
-               ;; with INVALID-ARRAY-INDEX-ERROR or
-               ;; INDEX-TOO-LARGE-ERROR?
-               (error 'simple-type-error
-                      :format-control "invalid index ~W in ~S"
-                      :format-arguments (list index array)
-                      :datum index
-                      :expected-type `(integer 0 (,length)))
-               (return-from %array-row-major-index nil)))
-         index))))
+        (do ((subs (nreverse subscripts) (cdr subs))
+             (axis (1- (array-rank array)) (1- axis))
+             (chunk-size 1)
+             (result 0))
+            ((null subs) result)
+          (declare (list subs) (fixnum axis chunk-size result))
+          (let ((index (car subs))
+                (dim (%array-dimension array axis)))
+            (declare (fixnum dim))
+            (unless (and (fixnump index) (< -1 index dim))
+              (if invalid-index-error-p
+                  (invalid-array-index-error array index dim axis)
+                  (return-from %array-row-major-index nil)))
+            (incf result (* chunk-size (the fixnum index)))
+            (setf chunk-size (* chunk-size dim))))
+        (let ((index (first subscripts))
+              (length (length (the (simple-array * (*)) array))))
+          (unless (and (fixnump index) (< -1 index length))
+            (if invalid-index-error-p
+                (invalid-array-index-error array index length)
+                (return-from %array-row-major-index nil)))
+          index))))

 
 (defun array-in-bounds-p (array &rest subscripts)
   #!+sb-doc
 
 (defun array-in-bounds-p (array &rest subscripts)
   #!+sb-doc

-  "Return T if the SUBSCIPTS are in bounds for the ARRAY, NIL otherwise."
+  "Return T if the SUBSCRIPTS are in bounds for the ARRAY, NIL otherwise."

   (if (%array-row-major-index array subscripts nil)
       t))
 
 (defun array-row-major-index (array &rest subscripts)
   (if (%array-row-major-index array subscripts nil)
       t))
 
 (defun array-row-major-index (array &rest subscripts)

+  (declare (truly-dynamic-extent subscripts))

   (%array-row-major-index array subscripts))
 
 (defun aref (array &rest subscripts)
   #!+sb-doc
   "Return the element of the ARRAY specified by the SUBSCRIPTS."
   (%array-row-major-index array subscripts))
 
 (defun aref (array &rest subscripts)
   #!+sb-doc
   "Return the element of the ARRAY specified by the SUBSCRIPTS."

+  (declare (truly-dynamic-extent subscripts))

   (row-major-aref array (%array-row-major-index array subscripts)))
 
   (row-major-aref array (%array-row-major-index array subscripts)))
 

-(defun %aset (array &rest stuff)
-  (let ((subscripts (butlast stuff))
-       (new-value (car (last stuff))))
-    (setf (row-major-aref array (%array-row-major-index array subscripts))
-         new-value)))
-
-;;; FIXME: What's supposed to happen with functions
-;;; like AREF when we (DEFUN (SETF FOO) ..) when
-;;; DEFSETF FOO is also defined? It seems as though the logical
-;;; thing to do would be to nuke the macro definition for (SETF FOO)
-;;; and replace it with the (SETF FOO) function, issuing a warning,
-;;; just as for ordinary functions
-;;;  * (LISP-IMPLEMENTATION-VERSION)
-;;;  "18a+ release x86-linux 2.4.7 6 November 1998 cvs"
-;;;  * (DEFMACRO ZOO (X) `(+ ,X ,X))
-;;;  ZOO
-;;;  * (DEFUN ZOO (X) (* 3 X))
-;;;  Warning: ZOO previously defined as a macro.
-;;;  ZOO
-;;; But that doesn't seem to be what happens in CMU CL.
-;;;
-;;; KLUDGE: this is probably because ANSI, in its wisdom (CLHS
-;;; 5.1.2.5) requires implementations to support
-;;;   (SETF (APPLY #'AREF ...) ...)
-;;; [and also #'BIT and #'SBIT].  Yes, this is terrifying, and it's
-;;; also terrifying that this sequence of definitions causes it to
-;;; work.
-;;;
-;;; Also, it would be nice to make DESCRIBE FOO tell whether a symbol
-;;; has a setf expansion and/or a setf function defined.
-
-#!-sb-fluid (declaim (inline (setf aref)))
+;;; (setf aref/bit/sbit) are implemented using setf-functions,
+;;; because they have to work with (setf (apply #'aref array subscripts))
+;;; All other setfs can be done using setf-functions too, but I
+;;; haven't found technical advantages or disatvantages for either
+;;; scheme.

 (defun (setf aref) (new-value array &rest subscripts)
 (defun (setf aref) (new-value array &rest subscripts)

-  (declare (type array array))
+  (declare (truly-dynamic-extent subscripts)
+           (type array array))

   (setf (row-major-aref array (%array-row-major-index array subscripts))
   (setf (row-major-aref array (%array-row-major-index array subscripts))

-       new-value))
+        new-value))

 
 (defun row-major-aref (array index)
   #!+sb-doc
 
 (defun row-major-aref (array index)
   #!+sb-doc

-  "Return the element of array corressponding to the row-major index. This is
-   SETF'able."
+  "Return the element of array corresponding to the row-major index. This is
+   SETFable."

   (declare (optimize (safety 1)))
   (row-major-aref array index))
 
   (declare (optimize (safety 1)))
   (row-major-aref array index))
 

@@ -425,7 +600,7 @@
 
 (defun svref (simple-vector index)
   #!+sb-doc
 
 (defun svref (simple-vector index)
   #!+sb-doc

-  "Return the INDEX'th element of the given Simple-Vector."
+  "Return the INDEXth element of the given Simple-Vector."

   (declare (optimize (safety 1)))
   (aref simple-vector index))
 
   (declare (optimize (safety 1)))
   (aref simple-vector index))
 

@@ -436,49 +611,33 @@
 (defun bit (bit-array &rest subscripts)
   #!+sb-doc
   "Return the bit from the BIT-ARRAY at the specified SUBSCRIPTS."
 (defun bit (bit-array &rest subscripts)
   #!+sb-doc
   "Return the bit from the BIT-ARRAY at the specified SUBSCRIPTS."

-  (declare (type (array bit) bit-array) (optimize (safety 1)))
+  (declare (type (array bit) bit-array)
+           (optimize (safety 1)))

   (row-major-aref bit-array (%array-row-major-index bit-array subscripts)))
 
   (row-major-aref bit-array (%array-row-major-index bit-array subscripts)))
 

-(defun %bitset (bit-array &rest stuff)
-  (declare (type (array bit) bit-array) (optimize (safety 1)))
-  (let ((subscripts (butlast stuff))
-       (new-value (car (last stuff))))
-    (setf (row-major-aref bit-array
-                         (%array-row-major-index bit-array subscripts))
-         new-value)))
-
-#!-sb-fluid (declaim (inline (setf bit)))

 (defun (setf bit) (new-value bit-array &rest subscripts)
 (defun (setf bit) (new-value bit-array &rest subscripts)

-  (declare (type (array bit) bit-array) (optimize (safety 1)))
+  (declare (type (array bit) bit-array)
+           (type bit new-value)
+           (optimize (safety 1)))

   (setf (row-major-aref bit-array
   (setf (row-major-aref bit-array

-                       (%array-row-major-index bit-array subscripts))
-       new-value))
+                        (%array-row-major-index bit-array subscripts))
+        new-value))

 
 (defun sbit (simple-bit-array &rest subscripts)
   #!+sb-doc
   "Return the bit from SIMPLE-BIT-ARRAY at the specified SUBSCRIPTS."
 
 (defun sbit (simple-bit-array &rest subscripts)
   #!+sb-doc
   "Return the bit from SIMPLE-BIT-ARRAY at the specified SUBSCRIPTS."

-  (declare (type (simple-array bit) simple-bit-array) (optimize (safety 1)))
+  (declare (type (simple-array bit) simple-bit-array)
+           (optimize (safety 1)))

   (row-major-aref simple-bit-array
   (row-major-aref simple-bit-array

-                 (%array-row-major-index simple-bit-array subscripts)))
-
-;;; KLUDGE: Not all these things (%SET-ROW-MAJOR-AREF, %SET-FILL-POINTER,
-;;; %SET-FDEFINITION, %SCHARSET, %SBITSET..) seem to deserve separate names.
-;;; Could we just DEFUN (SETF SBIT) etc. and get rid of the non-ANSI names?
-;;; -- WHN 19990911
-(defun %sbitset (simple-bit-array &rest stuff)
-  (declare (type (simple-array bit) simple-bit-array) (optimize (safety 1)))
-  (let ((subscripts (butlast stuff))
-       (new-value (car (last stuff))))
-    (setf (row-major-aref simple-bit-array
-                         (%array-row-major-index simple-bit-array subscripts))
-         new-value)))
-
-#!-sb-fluid (declaim (inline (setf sbit)))
+                  (%array-row-major-index simple-bit-array subscripts)))
+

 (defun (setf sbit) (new-value bit-array &rest subscripts)
 (defun (setf sbit) (new-value bit-array &rest subscripts)

-  (declare (type (simple-array bit) bit-array) (optimize (safety 1)))
+  (declare (type (simple-array bit) bit-array)
+           (type bit new-value)
+           (optimize (safety 1)))

   (setf (row-major-aref bit-array
   (setf (row-major-aref bit-array

-                       (%array-row-major-index bit-array subscripts))
-       new-value))
+                        (%array-row-major-index bit-array subscripts))
+        new-value))

 \f
 ;;;; miscellaneous array properties
 
 \f
 ;;;; miscellaneous array properties
 

@@ -487,37 +646,37 @@
   "Return the type of the elements of the array"
   (let ((widetag (widetag-of array)))
     (macrolet ((pick-element-type (&rest stuff)
   "Return the type of the elements of the array"
   (let ((widetag (widetag-of array)))
     (macrolet ((pick-element-type (&rest stuff)

-                `(cond ,@(mapcar (lambda (stuff)
-                                   (cons
-                                    (let ((item (car stuff)))
-                                      (cond ((eq item t)
-                                             t)
-                                            ((listp item)
-                                             (cons 'or
-                                                   (mapcar (lambda (x)
-                                                             `(= widetag ,x))
-                                                           item)))
-                                            (t
-                                             `(= widetag ,item))))
-                                    (cdr stuff)))
-                                 stuff))))
+                 `(cond ,@(mapcar (lambda (stuff)
+                                    (cons
+                                     (let ((item (car stuff)))
+                                       (cond ((eq item t)
+                                              t)
+                                             ((listp item)
+                                              (cons 'or
+                                                    (mapcar (lambda (x)
+                                                              `(= widetag ,x))
+                                                            item)))
+                                             (t
+                                              `(= widetag ,item))))
+                                     (cdr stuff)))
+                                  stuff))))

       #.`(pick-element-type
       #.`(pick-element-type

-         ,@(map 'list
-                (lambda (saetp)
-                  `(,(if (sb!vm:saetp-complex-typecode saetp)
-                         (list (sb!vm:saetp-typecode saetp)
-                               (sb!vm:saetp-complex-typecode saetp))
-                         (sb!vm:saetp-typecode saetp))
-                    ',(sb!vm:saetp-specifier saetp)))
-                sb!vm:*specialized-array-element-type-properties*)
-         ((sb!vm:simple-array-widetag
-           sb!vm:complex-vector-widetag
-           sb!vm:complex-array-widetag)
-          (with-array-data ((array array) (start) (end))
-            (declare (ignore start end))
-            (array-element-type array)))
-         (t
-          (error 'type-error :datum array :expected-type 'array))))))
+          ,@(map 'list
+                 (lambda (saetp)
+                   `(,(if (sb!vm:saetp-complex-typecode saetp)
+                          (list (sb!vm:saetp-typecode saetp)
+                                (sb!vm:saetp-complex-typecode saetp))
+                          (sb!vm:saetp-typecode saetp))
+                     ',(sb!vm:saetp-specifier saetp)))
+                 sb!vm:*specialized-array-element-type-properties*)
+          ((sb!vm:simple-array-widetag
+            sb!vm:complex-vector-widetag
+            sb!vm:complex-array-widetag)
+           (with-array-data ((array array) (start) (end))
+             (declare (ignore start end))
+             (array-element-type array)))
+          (t
+           (error 'type-error :datum array :expected-type 'array))))))

 
 (defun array-rank (array)
   #!+sb-doc
 
 (defun array-rank (array)
   #!+sb-doc

@@ -531,32 +690,14 @@
   "Return the length of dimension AXIS-NUMBER of ARRAY."
   (declare (array array) (type index axis-number))
   (cond ((not (array-header-p array))
   "Return the length of dimension AXIS-NUMBER of ARRAY."
   (declare (array array) (type index axis-number))
   (cond ((not (array-header-p array))

-        (unless (= axis-number 0)
-          (error "Vector axis is not zero: ~S" axis-number))
-        (length (the (simple-array * (*)) array)))
-       ((>= axis-number (%array-rank array))
-        (error "Axis number ~W is too big; ~S only has ~D dimension~:P."
-               axis-number array (%array-rank array)))
-       (t
-        ;; ANSI sayeth (ADJUST-ARRAY dictionary entry): 
-        ;; 
-        ;;   "If A is displaced to B, the consequences are
-        ;;   unspecified if B is adjusted in such a way that it no
-        ;;   longer has enough elements to satisfy A.
-        ;;
-        ;; In situations where this matters we should be doing a
-        ;; bounds-check, which in turn uses ARRAY-DIMENSION -- so
-        ;; this seems like a good place to signal an error.
-        (multiple-value-bind (target offset) (array-displacement array)
-          (when (and target 
-                     (> (array-total-size array)
-                        (- (array-total-size target) offset)))
-              (error 'displaced-to-array-too-small-error
-                     :format-control "~@<The displaced-to array is too small. ~S ~
-                                      elements after offset required, ~S available.~:@>"
-                     :format-arguments (list (array-total-size array) 
-                                             (- (array-total-size target) offset))))
-          (%array-dimension array axis-number)))))
+         (unless (= axis-number 0)
+           (error "Vector axis is not zero: ~S" axis-number))
+         (length (the (simple-array * (*)) array)))
+        ((>= axis-number (%array-rank array))
+         (error "Axis number ~W is too big; ~S only has ~D dimension~:P."
+                axis-number array (%array-rank array)))
+        (t
+         (%array-dimension array axis-number))))

 
 (defun array-dimensions (array)
   #!+sb-doc
 
 (defun array-dimensions (array)
   #!+sb-doc

@@ -564,8 +705,8 @@
   (declare (array array))
   (if (array-header-p array)
       (do ((results nil (cons (array-dimension array index) results))
   (declare (array array))
   (if (array-header-p array)
       (do ((results nil (cons (array-dimension array index) results))

-          (index (1- (array-rank array)) (1- index)))
-         ((minusp index) results))
+           (index (1- (array-rank array)) (1- index)))
+          ((minusp index) results))

       (list (array-dimension array 0))))
 
 (defun array-total-size (array)
       (list (array-dimension array 0))))
 
 (defun array-total-size (array)

@@ -582,7 +723,7 @@
    options to MAKE-ARRAY, or NIL and 0 if not a displaced array."
   (declare (type array array))
   (if (and (array-header-p array) ; if unsimple and
    options to MAKE-ARRAY, or NIL and 0 if not a displaced array."
   (declare (type array array))
   (if (and (array-header-p array) ; if unsimple and

-          (%array-displaced-p array)) ; displaced
+           (%array-displaced-p array)) ; displaced

       (values (%array-data-vector array) (%array-displacement array))
       (values nil 0)))
 
       (values (%array-data-vector array) (%array-displacement array))
       (values nil 0)))
 

@@ -599,68 +740,78 @@
 \f
 ;;;; fill pointer frobbing stuff
 
 \f
 ;;;; fill pointer frobbing stuff
 

+(declaim (inline array-has-fill-pointer-p))

 (defun array-has-fill-pointer-p (array)
   #!+sb-doc
   "Return T if the given ARRAY has a fill pointer, or NIL otherwise."
   (declare (array array))
   (and (array-header-p array) (%array-fill-pointer-p array)))
 
 (defun array-has-fill-pointer-p (array)
   #!+sb-doc
   "Return T if the given ARRAY has a fill pointer, or NIL otherwise."
   (declare (array array))
   (and (array-header-p array) (%array-fill-pointer-p array)))
 

+(defun fill-pointer-error (vector arg)
+  (cond (arg
+         (aver (array-has-fill-pointer-p vector))
+         (let ((max (%array-available-elements vector)))
+           (error 'simple-type-error
+                  :datum arg
+                  :expected-type (list 'integer 0 max)
+                  :format-control "The new fill pointer, ~S, is larger than the length of the vector (~S.)"
+                  :format-arguments (list arg max))))
+        (t
+         (error 'simple-type-error
+                :datum vector
+                :expected-type '(and vector (satisfies array-has-fill-pointer-p))
+                :format-control "~S is not an array with a fill pointer."
+                :format-arguments (list vector)))))
+
+(declaim (inline fill-pointer))

 (defun fill-pointer (vector)
   #!+sb-doc
   "Return the FILL-POINTER of the given VECTOR."
 (defun fill-pointer (vector)
   #!+sb-doc
   "Return the FILL-POINTER of the given VECTOR."

-  (declare (vector vector))
-  (if (and (array-header-p vector) (%array-fill-pointer-p vector))
+  (if (array-has-fill-pointer-p vector)

       (%array-fill-pointer vector)
       (%array-fill-pointer vector)

-      (error 'simple-type-error
-            :datum vector
-            :expected-type '(and vector (satisfies array-has-fill-pointer-p))
-            :format-control "~S is not an array with a fill pointer."
-            :format-arguments (list vector))))
+      (fill-pointer-error vector nil)))

 
 (defun %set-fill-pointer (vector new)
 
 (defun %set-fill-pointer (vector new)

-  (declare (vector vector) (fixnum new))
-  (if (and (array-header-p vector) (%array-fill-pointer-p vector))
-      (if (> new (%array-available-elements vector))
-       (error
-        "The new fill pointer, ~S, is larger than the length of the vector."
-        new)
-       (setf (%array-fill-pointer vector) new))
-      (error 'simple-type-error
-            :datum vector
-            :expected-type '(and vector (satisfies array-has-fill-pointer-p))
-            :format-control "~S is not an array with a fill pointer."
-            :format-arguments (list vector))))
+  (flet ((oops (x)
+           (fill-pointer-error vector x)))
+    (if (array-has-fill-pointer-p vector)
+        (if (> new (%array-available-elements vector))
+            (oops new)
+            (setf (%array-fill-pointer vector) new))
+        (oops nil))))

 
 ;;; FIXME: It'd probably make sense to use a MACROLET to share the
 ;;; guts of VECTOR-PUSH between VECTOR-PUSH-EXTEND. Such a macro
 ;;; should probably be based on the VECTOR-PUSH-EXTEND code (which is
 ;;; new ca. sbcl-0.7.0) rather than the VECTOR-PUSH code (which dates
 ;;; back to CMU CL).
 
 ;;; FIXME: It'd probably make sense to use a MACROLET to share the
 ;;; guts of VECTOR-PUSH between VECTOR-PUSH-EXTEND. Such a macro
 ;;; should probably be based on the VECTOR-PUSH-EXTEND code (which is
 ;;; new ca. sbcl-0.7.0) rather than the VECTOR-PUSH code (which dates
 ;;; back to CMU CL).

-(defun vector-push (new-el array)
+(defun vector-push (new-element array)

   #!+sb-doc
   "Attempt to set the element of ARRAY designated by its fill pointer
   #!+sb-doc
   "Attempt to set the element of ARRAY designated by its fill pointer

-   to NEW-EL, and increment the fill pointer by one. If the fill pointer is
+   to NEW-ELEMENT, and increment the fill pointer by one. If the fill pointer is

    too large, NIL is returned, otherwise the index of the pushed element is
    returned."
    too large, NIL is returned, otherwise the index of the pushed element is
    returned."

-  (declare (vector array))

   (let ((fill-pointer (fill-pointer array)))
     (declare (fixnum fill-pointer))
     (cond ((= fill-pointer (%array-available-elements array))
   (let ((fill-pointer (fill-pointer array)))
     (declare (fixnum fill-pointer))
     (cond ((= fill-pointer (%array-available-elements array))

-          nil)
-         (t
-          (setf (aref array fill-pointer) new-el)
-          (setf (%array-fill-pointer array) (1+ fill-pointer))
-          fill-pointer))))
-
-(defun vector-push-extend (new-element
-                          vector
-                          &optional
-                          (extension (1+ (length vector))))
-  (declare (vector vector) (fixnum extension))
+           nil)
+          (t
+           (locally (declare (optimize (safety 0)))
+             (setf (aref array fill-pointer) new-element))
+           (setf (%array-fill-pointer array) (1+ fill-pointer))
+           fill-pointer))))
+
+(defun vector-push-extend (new-element vector &optional min-extension)
+  (declare (type (or null fixnum) min-extension))

   (let ((fill-pointer (fill-pointer vector)))
     (declare (fixnum fill-pointer))
     (when (= fill-pointer (%array-available-elements vector))
   (let ((fill-pointer (fill-pointer vector)))
     (declare (fixnum fill-pointer))
     (when (= fill-pointer (%array-available-elements vector))

-      (adjust-array vector (+ fill-pointer extension)))
+      (let ((min-extension
+             (or min-extension
+                 (let ((length (length vector)))
+                   (min (1+ length)
+                        (- array-dimension-limit length))))))
+        (adjust-array vector (+ fill-pointer (max 1 min-extension)))))

     ;; disable bounds checking
     (locally (declare (optimize (safety 0)))
       (setf (aref vector fill-pointer) new-element))
     ;; disable bounds checking
     (locally (declare (optimize (safety 0)))
       (setf (aref vector fill-pointer) new-element))

@@ -671,284 +822,408 @@
   #!+sb-doc
   "Decrease the fill pointer by 1 and return the element pointed to by the
   new fill pointer."
   #!+sb-doc
   "Decrease the fill pointer by 1 and return the element pointed to by the
   new fill pointer."

-  (declare (vector array))

   (let ((fill-pointer (fill-pointer array)))
     (declare (fixnum fill-pointer))
     (if (zerop fill-pointer)
   (let ((fill-pointer (fill-pointer array)))
     (declare (fixnum fill-pointer))
     (if (zerop fill-pointer)

-       (error "There is nothing left to pop.")
-       ;; disable bounds checking (and any fixnum test)
-       (locally (declare (optimize (safety 0)))
-         (aref array
-               (setf (%array-fill-pointer array)
-                     (1- fill-pointer)))))))
+        (error "There is nothing left to pop.")
+        ;; disable bounds checking (and any fixnum test)
+        (locally (declare (optimize (safety 0)))
+          (aref array
+                (setf (%array-fill-pointer array)
+                      (1- fill-pointer)))))))

 
 \f
 ;;;; ADJUST-ARRAY
 
 (defun adjust-array (array dimensions &key
 
 \f
 ;;;; ADJUST-ARRAY
 
 (defun adjust-array (array dimensions &key

-                          (element-type (array-element-type array))
-                          (initial-element nil initial-element-p)
-                          (initial-contents nil initial-contents-p)
+                           (element-type (array-element-type array) element-type-p)
+                           (initial-element nil initial-element-p)
+                           (initial-contents nil initial-contents-p)

                            fill-pointer
                            fill-pointer

-                          displaced-to displaced-index-offset)
+                           displaced-to displaced-index-offset)

   #!+sb-doc
   "Adjust ARRAY's dimensions to the given DIMENSIONS and stuff."
   #!+sb-doc
   "Adjust ARRAY's dimensions to the given DIMENSIONS and stuff."

+  (when (invalid-array-p array)
+    (invalid-array-error array))

   (let ((dimensions (if (listp dimensions) dimensions (list dimensions))))
     (cond ((/= (the fixnum (length (the list dimensions)))
   (let ((dimensions (if (listp dimensions) dimensions (list dimensions))))
     (cond ((/= (the fixnum (length (the list dimensions)))

-              (the fixnum (array-rank array)))
-          (error "The number of dimensions not equal to rank of array."))
-         ((not (subtypep element-type (array-element-type array)))
-          (error "The new element type, ~S, is incompatible with old type."
-                 element-type)))
+               (the fixnum (array-rank array)))
+           (error "The number of dimensions not equal to rank of array."))
+          ((and element-type-p
+                (not (subtypep element-type (array-element-type array))))
+           (error "The new element type, ~S, is incompatible with old type."
+                  element-type))
+          ((and fill-pointer (not (array-has-fill-pointer-p array)))
+           (error 'type-error
+                  :datum array
+                  :expected-type '(satisfies array-has-fill-pointer-p))))

     (let ((array-rank (length (the list dimensions))))
       (declare (fixnum array-rank))
       (unless (= array-rank 1)
     (let ((array-rank (length (the list dimensions))))
       (declare (fixnum array-rank))
       (unless (= array-rank 1)

-       (when fill-pointer
-         (error "Only vectors can have fill pointers.")))
+        (when fill-pointer
+          (error "Only vectors can have fill pointers.")))

       (cond (initial-contents-p
       (cond (initial-contents-p

-            ;; array former contents replaced by INITIAL-CONTENTS
-            (if (or initial-element-p displaced-to)
-                 (error "INITIAL-CONTENTS may not be specified with ~
+             ;; array former contents replaced by INITIAL-CONTENTS
+             (if (or initial-element-p displaced-to)
+                 (error ":INITIAL-CONTENTS may not be specified with ~

                          the :INITIAL-ELEMENT or :DISPLACED-TO option."))
                          the :INITIAL-ELEMENT or :DISPLACED-TO option."))

-            (let* ((array-size (apply #'* dimensions))
-                   (array-data (data-vector-from-inits
-                                dimensions array-size element-type
-                                initial-contents initial-contents-p
+             (let* ((array-size (apply #'* dimensions))
+                    (array-data (data-vector-from-inits
+                                 dimensions array-size element-type nil
+                                 initial-contents initial-contents-p

                                  initial-element initial-element-p)))
                                  initial-element initial-element-p)))

-              (if (adjustable-array-p array)
-                  (set-array-header array array-data array-size
-                                (get-new-fill-pointer array array-size
-                                                      fill-pointer)
-                                0 dimensions nil)
-                  (if (array-header-p array)
-                      ;; simple multidimensional or single dimensional array
-                      (make-array dimensions
-                                  :element-type element-type
-                                  :initial-contents initial-contents)
-                      array-data))))
-           (displaced-to
-            ;; We already established that no INITIAL-CONTENTS was supplied.
-            (when initial-element
+               (if (adjustable-array-p array)
+                   (set-array-header array array-data array-size
+                                 (get-new-fill-pointer array array-size
+                                                       fill-pointer)
+                                 0 dimensions nil nil)
+                   (if (array-header-p array)
+                       ;; simple multidimensional or single dimensional array
+                       (make-array dimensions
+                                   :element-type element-type
+                                   :initial-contents initial-contents)
+                       array-data))))
+            (displaced-to
+             ;; We already established that no INITIAL-CONTENTS was supplied.
+             (when initial-element

                (error "The :INITIAL-ELEMENT option may not be specified ~
                        with :DISPLACED-TO."))
              (unless (subtypep element-type (array-element-type displaced-to))
                (error "can't displace an array of type ~S into another of ~
                        type ~S"
                (error "The :INITIAL-ELEMENT option may not be specified ~
                        with :DISPLACED-TO."))
              (unless (subtypep element-type (array-element-type displaced-to))
                (error "can't displace an array of type ~S into another of ~
                        type ~S"

-                     element-type (array-element-type displaced-to)))
-            (let ((displacement (or displaced-index-offset 0))
-                  (array-size (apply #'* dimensions)))
-              (declare (fixnum displacement array-size))
-              (if (< (the fixnum (array-total-size displaced-to))
-                     (the fixnum (+ displacement array-size)))
-                  (error "The :DISPLACED-TO array is too small."))
-              (if (adjustable-array-p array)
-                  ;; None of the original contents appear in adjusted array.
-                  (set-array-header array displaced-to array-size
-                                    (get-new-fill-pointer array array-size
-                                                          fill-pointer)
-                                    displacement dimensions t)
-                  ;; simple multidimensional or single dimensional array
-                  (make-array dimensions
-                              :element-type element-type
-                              :displaced-to displaced-to
-                              :displaced-index-offset
-                              displaced-index-offset))))
-           ((= array-rank 1)
-            (let ((old-length (array-total-size array))
-                  (new-length (car dimensions))
-                  new-data)
-              (declare (fixnum old-length new-length))
-              (with-array-data ((old-data array) (old-start)
-                                (old-end old-length))
-                (cond ((or (%array-displaced-p array)
-                           (< old-length new-length))
-                       (setf new-data
-                             (data-vector-from-inits
-                              dimensions new-length element-type
-                              initial-contents initial-contents-p
+                      element-type (array-element-type displaced-to)))
+             (let ((displacement (or displaced-index-offset 0))
+                   (array-size (apply #'* dimensions)))
+               (declare (fixnum displacement array-size))
+               (if (< (the fixnum (array-total-size displaced-to))
+                      (the fixnum (+ displacement array-size)))
+                   (error "The :DISPLACED-TO array is too small."))
+               (if (adjustable-array-p array)
+                   ;; None of the original contents appear in adjusted array.
+                   (set-array-header array displaced-to array-size
+                                     (get-new-fill-pointer array array-size
+                                                           fill-pointer)
+                                     displacement dimensions t nil)
+                   ;; simple multidimensional or single dimensional array
+                   (make-array dimensions
+                               :element-type element-type
+                               :displaced-to displaced-to
+                               :displaced-index-offset
+                               displaced-index-offset))))
+            ((= array-rank 1)
+             (let ((old-length (array-total-size array))
+                   (new-length (car dimensions))
+                   new-data)
+               (declare (fixnum old-length new-length))
+               (with-array-data ((old-data array) (old-start)
+                                 (old-end old-length))
+                 (cond ((or (and (array-header-p array)
+                                 (%array-displaced-p array))
+                            (< old-length new-length))
+                        (setf new-data
+                              (data-vector-from-inits
+                               dimensions new-length element-type
+                               (widetag-of old-data)
+                               initial-contents initial-contents-p

                                initial-element initial-element-p))
                                initial-element initial-element-p))

-                       (replace new-data old-data
-                                :start2 old-start :end2 old-end))
-                      (t (setf new-data
-                               (shrink-vector old-data new-length))))
-                (if (adjustable-array-p array)
-                    (set-array-header array new-data new-length
-                                      (get-new-fill-pointer array new-length
-                                                            fill-pointer)
-                                      0 dimensions nil)
-                    new-data))))
-           (t
-            (let ((old-length (%array-available-elements array))
-                  (new-length (apply #'* dimensions)))
-              (declare (fixnum old-length new-length))
-              (with-array-data ((old-data array) (old-start)
-                                (old-end old-length))
-                (declare (ignore old-end))
-                (let ((new-data (if (or (%array-displaced-p array)
-                                        (> new-length old-length))
-                                    (data-vector-from-inits
-                                     dimensions new-length
-                                     element-type () nil
+                        ;; Provide :END1 to avoid full call to LENGTH
+                        ;; inside REPLACE.
+                        (replace new-data old-data
+                                 :end1 new-length
+                                 :start2 old-start :end2 old-end))
+                       (t (setf new-data
+                                (shrink-vector old-data new-length))))
+                 (if (adjustable-array-p array)
+                     (set-array-header array new-data new-length
+                                       (get-new-fill-pointer array new-length
+                                                             fill-pointer)
+                                       0 dimensions nil nil)
+                     new-data))))
+            (t
+             (let ((old-length (%array-available-elements array))
+                   (new-length (apply #'* dimensions)))
+               (declare (fixnum old-length new-length))
+               (with-array-data ((old-data array) (old-start)
+                                 (old-end old-length))
+                 (declare (ignore old-end))
+                 (let ((new-data (if (or (and (array-header-p array)
+                                              (%array-displaced-p array))
+                                         (> new-length old-length))
+                                     (data-vector-from-inits
+                                      dimensions new-length
+                                      element-type
+                                      (widetag-of old-data) () nil

                                       initial-element initial-element-p)
                                       initial-element initial-element-p)

-                                    old-data)))
-                  (if (or (zerop old-length) (zerop new-length))
-                      (when initial-element-p (fill new-data initial-element))
-                      (zap-array-data old-data (array-dimensions array)
-                                      old-start
-                                      new-data dimensions new-length
-                                      element-type initial-element
-                                      initial-element-p))
-                  (if (adjustable-array-p array)
-                      (set-array-header array new-data new-length
-                                        new-length 0 dimensions nil)
-                      (let ((new-array
-                             (make-array-header
-                              sb!vm:simple-array-widetag array-rank)))
-                        (set-array-header new-array new-data new-length
-                                          new-length 0 dimensions nil)))))))))))
-  
+                                     old-data)))
+                   (if (or (zerop old-length) (zerop new-length))
+                       (when initial-element-p (fill new-data initial-element))
+                       (zap-array-data old-data (array-dimensions array)
+                                       old-start
+                                       new-data dimensions new-length
+                                       element-type initial-element
+                                       initial-element-p))
+                   (if (adjustable-array-p array)
+                       (set-array-header array new-data new-length
+                                         nil 0 dimensions nil nil)
+                       (let ((new-array
+                              (make-array-header
+                               sb!vm:simple-array-widetag array-rank)))
+                         (set-array-header new-array new-data new-length
+                                           nil 0 dimensions nil t)))))))))))
+

 
 (defun get-new-fill-pointer (old-array new-array-size fill-pointer)
   (cond ((not fill-pointer)
 
 (defun get-new-fill-pointer (old-array new-array-size fill-pointer)
   (cond ((not fill-pointer)

-        (when (array-has-fill-pointer-p old-array)
-          (when (> (%array-fill-pointer old-array) new-array-size)
-            (error "cannot ADJUST-ARRAY an array (~S) to a size (~S) that is ~
+         (when (array-has-fill-pointer-p old-array)
+           (when (> (%array-fill-pointer old-array) new-array-size)
+             (error "cannot ADJUST-ARRAY an array (~S) to a size (~S) that is ~

                      smaller than its fill pointer (~S)"
                      smaller than its fill pointer (~S)"

-                   old-array new-array-size (fill-pointer old-array)))
-          (%array-fill-pointer old-array)))
-       ((not (array-has-fill-pointer-p old-array))
-        (error "cannot supply a non-NIL value (~S) for :FILL-POINTER ~
+                    old-array new-array-size (fill-pointer old-array)))
+           (%array-fill-pointer old-array)))
+        ((not (array-has-fill-pointer-p old-array))
+         (error "cannot supply a non-NIL value (~S) for :FILL-POINTER ~

                  in ADJUST-ARRAY unless the array (~S) was originally ~
                  created with a fill pointer"
                  in ADJUST-ARRAY unless the array (~S) was originally ~
                  created with a fill pointer"

-               fill-pointer
-               old-array))
-       ((numberp fill-pointer)
-        (when (> fill-pointer new-array-size)
-          (error "can't supply a value for :FILL-POINTER (~S) that is larger ~
+                fill-pointer
+                old-array))
+        ((numberp fill-pointer)
+         (when (> fill-pointer new-array-size)
+           (error "can't supply a value for :FILL-POINTER (~S) that is larger ~

                    than the new length of the vector (~S)"
                    than the new length of the vector (~S)"

-                 fill-pointer new-array-size))
-        fill-pointer)
-       ((eq fill-pointer t)
-        new-array-size)
-       (t
-        (error "bogus value for :FILL-POINTER in ADJUST-ARRAY: ~S"
-               fill-pointer))))
+                  fill-pointer new-array-size))
+         fill-pointer)
+        ((eq fill-pointer t)
+         new-array-size)
+        (t
+         (error "bogus value for :FILL-POINTER in ADJUST-ARRAY: ~S"
+                fill-pointer))))

 
 ;;; Destructively alter VECTOR, changing its length to NEW-LENGTH,
 
 ;;; Destructively alter VECTOR, changing its length to NEW-LENGTH,

-;;; which must be less than or equal to its current length.
-(defun shrink-vector (vector new-length)
+;;; which must be less than or equal to its current length. This can
+;;; be called on vectors without a fill pointer but it is extremely
+;;; dangerous to do so: shrinking the size of an object (as viewed by
+;;; the gc) makes bounds checking unreliable in the face of interrupts
+;;; or multi-threading. Call it only on provably local vectors.
+(defun %shrink-vector (vector new-length)

   (declare (vector vector))
   (unless (array-header-p vector)
     (macrolet ((frob (name &rest things)
   (declare (vector vector))
   (unless (array-header-p vector)
     (macrolet ((frob (name &rest things)

-                `(etypecase ,name
-                   ((simple-array nil (*)) (error 'nil-array-accessed-error))
-                   ,@(mapcar (lambda (thing)
-                               (destructuring-bind (type-spec fill-value)
-                                   thing
-                                 `(,type-spec
-                                   (fill (truly-the ,type-spec ,name)
-                                         ,fill-value
-                                         :start new-length))))
-                             things))))
+                 `(etypecase ,name
+                    ((simple-array nil (*)) (error 'nil-array-accessed-error))
+                    ,@(mapcar (lambda (thing)
+                                (destructuring-bind (type-spec fill-value)
+                                    thing
+                                  `(,type-spec
+                                    (fill (truly-the ,type-spec ,name)
+                                          ,fill-value
+                                          :start new-length))))
+                              things))))
+      ;; Set the 'tail' of the vector to the appropriate type of zero,
+      ;; "because in some cases we'll scavenge larger areas in one go,
+      ;; like groups of pages that had triggered the write barrier, or
+      ;; the whole static space" according to jsnell.

       #.`(frob vector
       #.`(frob vector

-         ,@(map 'list
-                (lambda (saetp)
-                  `((simple-array ,(sb!vm:saetp-specifier saetp) (*))
-                    ,(if (eq (sb!vm:saetp-specifier saetp) 'character)
-                         *default-init-char-form*
-                         (sb!vm:saetp-initial-element-default saetp))))
-                (remove-if-not
-                 #'sb!vm:saetp-specifier
-                 sb!vm:*specialized-array-element-type-properties*)))))
+          ,@(map 'list
+                 (lambda (saetp)
+                   `((simple-array ,(sb!vm:saetp-specifier saetp) (*))
+                     ,(if (or (eq (sb!vm:saetp-specifier saetp) 'character)
+                              #!+sb-unicode
+                              (eq (sb!vm:saetp-specifier saetp) 'base-char))
+                          *default-init-char-form*
+                          (sb!vm:saetp-initial-element-default saetp))))
+                 (remove-if-not
+                  #'sb!vm:saetp-specifier
+                  sb!vm:*specialized-array-element-type-properties*)))))

   ;; Only arrays have fill-pointers, but vectors have their length
   ;; parameter in the same place.
   (setf (%array-fill-pointer vector) new-length)
   vector)
 
   ;; Only arrays have fill-pointers, but vectors have their length
   ;; parameter in the same place.
   (setf (%array-fill-pointer vector) new-length)
   vector)
 

+(defun shrink-vector (vector new-length)
+  (declare (vector vector))
+  (cond
+    ((eq (length vector) new-length)
+     vector)
+    ((array-has-fill-pointer-p vector)
+     (setf (%array-fill-pointer vector) new-length)
+     vector)
+    (t (subseq vector 0 new-length))))
+
+;;; BIG THREAD SAFETY NOTE
+;;;
+;;; ADJUST-ARRAY/SET-ARRAY-HEADER, and its callees are very
+;;; thread unsafe. They are nonatomic, and can mess with parallel
+;;; code using the same arrays.
+;;;
+;;; A likely seeming fix is an additional level of indirection:
+;;; ARRAY-HEADER -> ARRAY-INFO -> ... where ARRAY-HEADER would
+;;; hold nothing but the pointer to ARRAY-INFO, and ARRAY-INFO
+;;; would hold everything ARRAY-HEADER now holds. This allows
+;;; consing up a new ARRAY-INFO and replacing it atomically in
+;;; the ARRAY-HEADER.
+;;;
+;;; %WALK-DISPLACED-ARRAY-BACKPOINTERS is an especially nasty
+;;; one: not only is it needed extremely rarely, which makes
+;;; any thread safety bugs involving it look like rare random
+;;; corruption, but because it walks the chain *upwards*, which
+;;; may violate user expectations.
+
+(defun %save-displaced-array-backpointer (array data)
+  (flet ((purge (pointers)
+           (remove-if (lambda (value)
+                        (or (not value) (eq array value)))
+                      pointers
+                      :key #'weak-pointer-value)))
+    ;; Add backpointer to the new data vector if it has a header.
+    (when (array-header-p data)
+      (setf (%array-displaced-from data)
+            (cons (make-weak-pointer array)
+                  (purge (%array-displaced-from data)))))
+    ;; Remove old backpointer, if any.
+    (let ((old-data (%array-data-vector array)))
+      (when (and (neq data old-data) (array-header-p old-data))
+        (setf (%array-displaced-from old-data)
+              (purge (%array-displaced-from old-data)))))))
+
+(defun %walk-displaced-array-backpointers (array new-length)
+  (dolist (p (%array-displaced-from array))
+    (let ((from (weak-pointer-value p)))
+      (when (and from (eq array (%array-data-vector from)))
+        (let ((requires (+ (%array-available-elements from)
+                           (%array-displacement from))))
+          (unless (>= new-length requires)
+            ;; ANSI sayeth (ADJUST-ARRAY dictionary entry):
+            ;;
+            ;;   "If A is displaced to B, the consequences are unspecified if B is
+            ;;   adjusted in such a way that it no longer has enough elements to
+            ;;   satisfy A.
+            ;;
+            ;; since we're hanging on a weak pointer here, we can't signal an
+            ;; error right now: the array that we're looking at might be
+            ;; garbage. Instead, we set all dimensions to zero so that next
+            ;; safe access to the displaced array will trap. Additionally, we
+            ;; save the original dimensions, so we can signal a more
+            ;; understandable error when the time comes.
+            (%walk-displaced-array-backpointers from 0)
+            (setf (%array-fill-pointer from) 0
+                  (%array-available-elements from) 0
+                  (%array-displaced-p from) (array-dimensions array))
+            (dotimes (i (%array-rank from))
+              (setf (%array-dimension from i) 0))))))))
+

 ;;; Fill in array header with the provided information, and return the array.
 (defun set-array-header (array data length fill-pointer displacement dimensions
 ;;; Fill in array header with the provided information, and return the array.
 (defun set-array-header (array data length fill-pointer displacement dimensions

-                        &optional displacedp)
+                         displacedp newp)
+  (if newp
+      (setf (%array-displaced-from array) nil)
+      (%walk-displaced-array-backpointers array length))
+  (when displacedp
+    (%save-displaced-array-backpointer array data))

   (setf (%array-data-vector array) data)
   (setf (%array-available-elements array) length)
   (cond (fill-pointer
   (setf (%array-data-vector array) data)
   (setf (%array-available-elements array) length)
   (cond (fill-pointer

-        (setf (%array-fill-pointer array) fill-pointer)
-        (setf (%array-fill-pointer-p array) t))
-       (t
-        (setf (%array-fill-pointer array) length)
-        (setf (%array-fill-pointer-p array) nil)))
+         (setf (%array-fill-pointer array) fill-pointer)
+         (setf (%array-fill-pointer-p array) t))
+        (t
+         (setf (%array-fill-pointer array) length)
+         (setf (%array-fill-pointer-p array) nil)))

   (setf (%array-displacement array) displacement)
   (if (listp dimensions)
       (dotimes (axis (array-rank array))
   (setf (%array-displacement array) displacement)
   (if (listp dimensions)
       (dotimes (axis (array-rank array))

-       (declare (type index axis))
-       (setf (%array-dimension array axis) (pop dimensions)))
+        (declare (type index axis))
+        (setf (%array-dimension array axis) (pop dimensions)))

       (setf (%array-dimension array 0) dimensions))
   (setf (%array-displaced-p array) displacedp)
   array)
       (setf (%array-dimension array 0) dimensions))
   (setf (%array-displaced-p array) displacedp)
   array)

-\f
-;;;; ZAP-ARRAY-DATA for ADJUST-ARRAY

 
 

-;;; a temporary to be used when OLD-DATA and NEW-DATA are EQ.
-;;; KLUDGE: Boy, DYNAMIC-EXTENT would be nice.
-(defvar *zap-array-data-temp* (make-array 1000 :initial-element t))
+;;; User visible extension
+(declaim (ftype (function (array) (values (simple-array * (*)) &optional))
+                array-storage-vector))
+(defun array-storage-vector (array)
+  "Returns the underlying storage vector of ARRAY, which must be a non-displaced array.
+
+In SBCL, if ARRAY is a of type \(SIMPLE-ARRAY * \(*)), it is its own storage
+vector. Multidimensional arrays, arrays with fill pointers, and adjustable
+arrays have an underlying storage vector with the same ARRAY-ELEMENT-TYPE as
+ARRAY, which this function returns.
+
+Important note: the underlying vector is an implementation detail. Even though
+this function exposes it, changes in the implementation may cause this
+function to be removed without further warning."
+  ;; KLUDGE: Without TRULY-THE the system is not smart enough to figure out that
+  ;; the return value is always of the known type.
+  (truly-the (simple-array * (*))
+             (if (array-header-p array)
+                 (if (%array-displaced-p array)
+                     (error "~S cannot be used with displaced arrays. Use ~S instead."
+                            'array-storage-vector 'array-displacement)
+                     (%array-data-vector array))
+                 array)))
+\f

 
 

-(defun zap-array-data-temp (length element-type initial-element
-                           initial-element-p)
-  (declare (fixnum length))
-  (when (> length (the fixnum (length *zap-array-data-temp*)))
-    (setf *zap-array-data-temp*
-         (make-array length :initial-element t)))
-  (when initial-element-p
-    (unless (typep initial-element element-type)
-      (error "~S can't be used to initialize an array of type ~S."
-            initial-element element-type))
-    (fill (the simple-vector *zap-array-data-temp*) initial-element
-         :end length))
-  *zap-array-data-temp*)
+;;;; ZAP-ARRAY-DATA for ADJUST-ARRAY

 
 ;;; This does the grinding work for ADJUST-ARRAY. It zaps the data
 ;;; from the OLD-DATA in an arrangement specified by the OLD-DIMS to
 ;;; the NEW-DATA in an arrangement specified by the NEW-DIMS. OFFSET
 ;;; is a displaced offset to be added to computed indices of OLD-DATA.
 
 ;;; This does the grinding work for ADJUST-ARRAY. It zaps the data
 ;;; from the OLD-DATA in an arrangement specified by the OLD-DIMS to
 ;;; the NEW-DATA in an arrangement specified by the NEW-DIMS. OFFSET
 ;;; is a displaced offset to be added to computed indices of OLD-DATA.

-;;; NEW-LENGTH, ELEMENT-TYPE, INITIAL-ELEMENT, and INITIAL-ELEMENT-P
-;;; are used when OLD-DATA and NEW-DATA are EQ; in this case, a
-;;; temporary must be used and filled appropriately. When OLD-DATA and
-;;; NEW-DATA are not EQ, NEW-DATA has already been filled with any
-;;; specified initial-element.

 (defun zap-array-data (old-data old-dims offset new-data new-dims new-length
 (defun zap-array-data (old-data old-dims offset new-data new-dims new-length

-                      element-type initial-element initial-element-p)
-  (declare (list old-dims new-dims))
-  (setq old-dims (nreverse old-dims))
-  (setq new-dims (reverse new-dims))
-  (if (eq old-data new-data)
-      (let ((temp (zap-array-data-temp new-length element-type
-                                      initial-element initial-element-p)))
-       (zap-array-data-aux old-data old-dims offset temp new-dims)
-       (dotimes (i new-length) (setf (aref new-data i) (aref temp i))))
-      (zap-array-data-aux old-data old-dims offset new-data new-dims)))
+                       element-type initial-element initial-element-p)
+  (declare (list old-dims new-dims)
+           (fixnum new-length))
+  ;; OLD-DIMS comes from array-dimensions, which returns a fresh list
+  ;; at least in SBCL.
+  ;; NEW-DIMS comes from the user.
+  (setf old-dims (nreverse old-dims)
+        new-dims (reverse new-dims))
+  (cond ((eq old-data new-data)
+         ;; NEW-LENGTH, ELEMENT-TYPE, INITIAL-ELEMENT, and
+         ;; INITIAL-ELEMENT-P are used when OLD-DATA and NEW-DATA are
+         ;; EQ; in this case, a temporary must be used and filled
+         ;; appropriately. specified initial-element.
+         (when initial-element-p
+           ;; FIXME: transforming this TYPEP to someting a bit faster
+           ;; would be a win...
+           (unless (typep initial-element element-type)
+             (error "~S can't be used to initialize an array of type ~S."
+                    initial-element element-type)))
+         (let ((temp (if initial-element-p
+                         (make-array new-length :initial-element initial-element)
+                         (make-array new-length))))
+           (declare (simple-vector temp))
+           (zap-array-data-aux old-data old-dims offset temp new-dims)
+           (dotimes (i new-length)
+             (setf (aref new-data i) (aref temp i)))
+           ;; Kill the temporary vector to prevent garbage retention.
+           (%shrink-vector temp 0)))
+        (t
+         ;; When OLD-DATA and NEW-DATA are not EQ, NEW-DATA has
+         ;; already been filled with any
+         (zap-array-data-aux old-data old-dims offset new-data new-dims))))

 
 (defun zap-array-data-aux (old-data old-dims offset new-data new-dims)
   (declare (fixnum offset))
   (let ((limits (mapcar (lambda (x y)
 
 (defun zap-array-data-aux (old-data old-dims offset new-data new-dims)
   (declare (fixnum offset))
   (let ((limits (mapcar (lambda (x y)

-                         (declare (fixnum x y))
-                         (1- (the fixnum (min x y))))
-                       old-dims new-dims)))
+                          (declare (fixnum x y))
+                          (1- (the fixnum (min x y))))
+                        old-dims new-dims)))

     (macrolet ((bump-index-list (index limits)
     (macrolet ((bump-index-list (index limits)

-                `(do ((subscripts ,index (cdr subscripts))
-                      (limits ,limits (cdr limits)))
-                     ((null subscripts) :eof)
-                   (cond ((< (the fixnum (car subscripts))
-                             (the fixnum (car limits)))
-                          (rplaca subscripts
-                                  (1+ (the fixnum (car subscripts))))
-                          (return ,index))
-                         (t (rplaca subscripts 0))))))
+                 `(do ((subscripts ,index (cdr subscripts))
+                       (limits ,limits (cdr limits)))
+                      ((null subscripts) :eof)
+                    (cond ((< (the fixnum (car subscripts))
+                              (the fixnum (car limits)))
+                           (rplaca subscripts
+                                   (1+ (the fixnum (car subscripts))))
+                           (return ,index))
+                          (t (rplaca subscripts 0))))))

       (do ((index (make-list (length old-dims) :initial-element 0)
       (do ((index (make-list (length old-dims) :initial-element 0)

-                 (bump-index-list index limits)))
-         ((eq index :eof))
-       (setf (aref new-data (row-major-index-from-dims index new-dims))
-             (aref old-data
-                   (+ (the fixnum (row-major-index-from-dims index old-dims))
-                      offset)))))))
+                  (bump-index-list index limits)))
+          ((eq index :eof))
+        (setf (aref new-data (row-major-index-from-dims index new-dims))
+              (aref old-data
+                    (+ (the fixnum (row-major-index-from-dims index old-dims))
+                       offset)))))))

 
 ;;; Figure out the row-major-order index of an array reference from a
 ;;; list of subscripts and a list of dimensions. This is for internal
 
 ;;; Figure out the row-major-order index of an array reference from a
 ;;; list of subscripts and a list of dimensions. This is for internal

@@ -962,8 +1237,8 @@
       ((null rev-dim-list) result)
     (declare (fixnum chunk-size result))
     (setq result (+ result
       ((null rev-dim-list) result)
     (declare (fixnum chunk-size result))
     (setq result (+ result

-                   (the fixnum (* (the fixnum (car rev-subscripts))
-                                  chunk-size))))
+                    (the fixnum (* (the fixnum (car rev-subscripts))
+                                   chunk-size))))

     (setq chunk-size (* chunk-size (the fixnum (car rev-dim-list))))))
 \f
 ;;;; some bit stuff
     (setq chunk-size (* chunk-size (the fixnum (car rev-dim-list))))))
 \f
 ;;;; some bit stuff

@@ -971,60 +1246,60 @@
 (defun bit-array-same-dimensions-p (array1 array2)
   (declare (type (array bit) array1 array2))
   (and (= (array-rank array1)
 (defun bit-array-same-dimensions-p (array1 array2)
   (declare (type (array bit) array1 array2))
   (and (= (array-rank array1)

-         (array-rank array2))
+          (array-rank array2))

        (dotimes (index (array-rank array1) t)
        (dotimes (index (array-rank array1) t)

-        (when (/= (array-dimension array1 index)
-                  (array-dimension array2 index))
-          (return nil)))))
+         (when (/= (array-dimension array1 index)
+                   (array-dimension array2 index))
+           (return nil)))))

 
 (defun pick-result-array (result-bit-array bit-array-1)
   (case result-bit-array
     ((t) bit-array-1)
     ((nil) (make-array (array-dimensions bit-array-1)
 
 (defun pick-result-array (result-bit-array bit-array-1)
   (case result-bit-array
     ((t) bit-array-1)
     ((nil) (make-array (array-dimensions bit-array-1)

-                      :element-type 'bit
-                      :initial-element 0))
+                       :element-type 'bit
+                       :initial-element 0))

     (t
      (unless (bit-array-same-dimensions-p bit-array-1
     (t
      (unless (bit-array-same-dimensions-p bit-array-1

-                                         result-bit-array)
+                                          result-bit-array)

        (error "~S and ~S don't have the same dimensions."
        (error "~S and ~S don't have the same dimensions."

-             bit-array-1 result-bit-array))
+              bit-array-1 result-bit-array))

      result-bit-array)))
 
 (defmacro def-bit-array-op (name function)
   `(defun ,name (bit-array-1 bit-array-2 &optional result-bit-array)
      #!+sb-doc
      ,(format nil
      result-bit-array)))
 
 (defmacro def-bit-array-op (name function)
   `(defun ,name (bit-array-1 bit-array-2 &optional result-bit-array)
      #!+sb-doc
      ,(format nil

-             "Perform a bit-wise ~A on the elements of BIT-ARRAY-1 and ~
+              "Perform a bit-wise ~A on the elements of BIT-ARRAY-1 and ~

                BIT-ARRAY-2,~%  putting the results in RESULT-BIT-ARRAY. ~
                If RESULT-BIT-ARRAY is T,~%  BIT-ARRAY-1 is used. If ~
                RESULT-BIT-ARRAY is NIL or omitted, a new array is~%  created. ~
                All the arrays must have the same rank and dimensions."
                BIT-ARRAY-2,~%  putting the results in RESULT-BIT-ARRAY. ~
                If RESULT-BIT-ARRAY is T,~%  BIT-ARRAY-1 is used. If ~
                RESULT-BIT-ARRAY is NIL or omitted, a new array is~%  created. ~
                All the arrays must have the same rank and dimensions."

-             (symbol-name function))
+              (symbol-name function))

      (declare (type (array bit) bit-array-1 bit-array-2)
      (declare (type (array bit) bit-array-1 bit-array-2)

-             (type (or (array bit) (member t nil)) result-bit-array))
+              (type (or (array bit) (member t nil)) result-bit-array))

      (unless (bit-array-same-dimensions-p bit-array-1 bit-array-2)
        (error "~S and ~S don't have the same dimensions."
      (unless (bit-array-same-dimensions-p bit-array-1 bit-array-2)
        (error "~S and ~S don't have the same dimensions."

-             bit-array-1 bit-array-2))
+              bit-array-1 bit-array-2))

      (let ((result-bit-array (pick-result-array result-bit-array bit-array-1)))
        (if (and (simple-bit-vector-p bit-array-1)
      (let ((result-bit-array (pick-result-array result-bit-array bit-array-1)))
        (if (and (simple-bit-vector-p bit-array-1)

-               (simple-bit-vector-p bit-array-2)
-               (simple-bit-vector-p result-bit-array))
-          (locally (declare (optimize (speed 3) (safety 0)))
-            (,name bit-array-1 bit-array-2 result-bit-array))
-          (with-array-data ((data1 bit-array-1) (start1) (end1))
-            (declare (ignore end1))
-            (with-array-data ((data2 bit-array-2) (start2) (end2))
-              (declare (ignore end2))
-              (with-array-data ((data3 result-bit-array) (start3) (end3))
-                (do ((index-1 start1 (1+ index-1))
-                     (index-2 start2 (1+ index-2))
-                     (index-3 start3 (1+ index-3)))
-                    ((>= index-3 end3) result-bit-array)
-                  (declare (type index index-1 index-2 index-3))
-                  (setf (sbit data3 index-3)
-                        (logand (,function (sbit data1 index-1)
-                                           (sbit data2 index-2))
-                                1))))))))))
+                (simple-bit-vector-p bit-array-2)
+                (simple-bit-vector-p result-bit-array))
+           (locally (declare (optimize (speed 3) (safety 0)))
+             (,name bit-array-1 bit-array-2 result-bit-array))
+           (with-array-data ((data1 bit-array-1) (start1) (end1))
+             (declare (ignore end1))
+             (with-array-data ((data2 bit-array-2) (start2) (end2))
+               (declare (ignore end2))
+               (with-array-data ((data3 result-bit-array) (start3) (end3))
+                 (do ((index-1 start1 (1+ index-1))
+                      (index-2 start2 (1+ index-2))
+                      (index-3 start3 (1+ index-3)))
+                     ((>= index-3 end3) result-bit-array)
+                   (declare (type index index-1 index-2 index-3))
+                   (setf (sbit data3 index-3)
+                         (logand (,function (sbit data1 index-1)
+                                            (sbit data2 index-2))
+                                 1))))))))))

 
 (def-bit-array-op bit-and logand)
 (def-bit-array-op bit-ior logior)
 
 (def-bit-array-op bit-and logand)
 (def-bit-array-op bit-ior logior)

@@ -1044,18 +1319,74 @@
   BIT-ARRAY is used. If RESULT-BIT-ARRAY is NIL or omitted, a new array is
   created. Both arrays must have the same rank and dimensions."
   (declare (type (array bit) bit-array)
   BIT-ARRAY is used. If RESULT-BIT-ARRAY is NIL or omitted, a new array is
   created. Both arrays must have the same rank and dimensions."
   (declare (type (array bit) bit-array)

-          (type (or (array bit) (member t nil)) result-bit-array))
+           (type (or (array bit) (member t nil)) result-bit-array))

   (let ((result-bit-array (pick-result-array result-bit-array bit-array)))
     (if (and (simple-bit-vector-p bit-array)
   (let ((result-bit-array (pick-result-array result-bit-array bit-array)))
     (if (and (simple-bit-vector-p bit-array)

-            (simple-bit-vector-p result-bit-array))
-       (locally (declare (optimize (speed 3) (safety 0)))
-         (bit-not bit-array result-bit-array))
-       (with-array-data ((src bit-array) (src-start) (src-end))
-         (declare (ignore src-end))
-         (with-array-data ((dst result-bit-array) (dst-start) (dst-end))
-           (do ((src-index src-start (1+ src-index))
-                (dst-index dst-start (1+ dst-index)))
-               ((>= dst-index dst-end) result-bit-array)
-             (declare (type index src-index dst-index))
-             (setf (sbit dst dst-index)
-                   (logxor (sbit src src-index) 1))))))))
+             (simple-bit-vector-p result-bit-array))
+        (locally (declare (optimize (speed 3) (safety 0)))
+          (bit-not bit-array result-bit-array))
+        (with-array-data ((src bit-array) (src-start) (src-end))
+          (declare (ignore src-end))
+          (with-array-data ((dst result-bit-array) (dst-start) (dst-end))
+            (do ((src-index src-start (1+ src-index))
+                 (dst-index dst-start (1+ dst-index)))
+                ((>= dst-index dst-end) result-bit-array)
+              (declare (type index src-index dst-index))
+              (setf (sbit dst dst-index)
+                    (logxor (sbit src src-index) 1))))))))
+
+;;;; array type dispatching
+
+;;; Given DISPATCH-FOO as the DISPATCH-NAME argument (unevaluated),
+;;; defines the functions
+;;;
+;;; DISPATCH-FOO/SIMPLE-BASE-STRING
+;;; DISPATCH-FOO/SIMPLE-CHARACTER-STRING
+;;; DISPATCH-FOO/SIMPLE-ARRAY-SINGLE-FLOAT
+;;; ...
+;;;
+;;; PARAMS are the function parameters in the definition of each
+;;; specializer function. The array being specialized must be the
+;;; first parameter in PARAMS. A type declaration for this parameter
+;;; is automatically inserted into the body of each function.
+;;;
+;;; The dispatch table %%FOO-FUNS%% is defined and populated by these
+;;; functions. The table is padded by the function
+;;; HAIRY-FOO-DISPATCH-ERROR, also defined by DEFINE-ARRAY-DISPATCH.
+;;;
+;;; Finally, the DISPATCH-FOO macro is defined which does the actual
+;;; dispatching when called. It expects arguments that match PARAMS.
+;;;
+(defmacro define-array-dispatch (dispatch-name params &body body)
+  (let ((table-name (symbolicate "%%" dispatch-name "-FUNS%%"))
+        (error-name (symbolicate "HAIRY-" dispatch-name "-ERROR")))
+    `(progn
+       (eval-when (:compile-toplevel :load-toplevel :execute)
+         (defun ,error-name (&rest args)
+           (error 'type-error
+                  :datum (first args)
+                  :expected-type '(simple-array * (*)))))
+       (defglobal ,table-name (make-array ,(1+ sb!vm:widetag-mask)
+                                          :initial-element #',error-name))
+       ,@(loop for info across sb!vm:*specialized-array-element-type-properties*
+               for typecode = (sb!vm:saetp-typecode info)
+               for specifier = (sb!vm:saetp-specifier info)
+               for primitive-type-name = (sb!vm:saetp-primitive-type-name info)
+               collect (let ((fun-name (symbolicate (string dispatch-name)
+                                                    "/" primitive-type-name)))
+                         `(progn
+                            (defun ,fun-name ,params
+                              (declare (type (simple-array ,specifier (*))
+                                             ,(first params)))
+                              ,@body)
+                            (setf (svref ,table-name ,typecode) #',fun-name))))
+       (defmacro ,dispatch-name (&rest args)
+         (check-type (first args) symbol)
+         (let ((tag (gensym "TAG")))
+           `(funcall
+             (the function
+               (let ((,tag 0))
+                 (when (sb!vm::%other-pointer-p ,(first args))
+                   (setf ,tag (%other-pointer-widetag ,(first args))))
+                 (svref ,',table-name ,tag)))
+             ,@args))))))