X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-tran.lisp;h=7031de38919acc1fcc89d5b09132181525f0ec7c;hb=cd2c70c8b5d4dcc62b968f5a9bedd3c9c8698e82;hp=feba3177a77a9e61b3f40d35f7cc90e6f6751c32;hpb=0704fd3f3f027ec1be05ddb986b6ca538aa165ca;p=sbcl.git

diff --git a/src/compiler/generic/vm-tran.lisp b/src/compiler/generic/vm-tran.lisp
index feba317..7031de3 100644
--- a/src/compiler/generic/vm-tran.lisp
+++ b/src/compiler/generic/vm-tran.lisp
@@ -54,20 +54,7 @@
     ;; to hand-expand it ourselves.)
     (let ((element-type-specifier (type-specifier element-ctype)))
       `(multiple-value-bind (array index)
-	   ;; FIXME: All this noise should move into a
-	   ;; %DATA-VECTOR-AND-INDEX function, and there should be
-	   ;; DEFTRANSFORMs for %DATA-VECTOR-AND-INDEX to optimize the
-	   ;; function call away when the array is known to be simple,
-	   ;; and to specialize to
-	   ;; %DATA-VECTOR-AND-INDEX-IN-VECTOR-CASE when the array is
-	   ;; known to have only one dimension.
-	   (if (array-header-p array)
-	       (%with-array-data array index nil)
-	       (let ((array array))
-		 (declare (type (simple-array ,element-type-specifier 1)
-				array))
-		 (%check-bound array 0 index)
-		 (values array index)))
+	   (%data-vector-and-index array index)
 	 (declare (type (simple-array ,element-type-specifier 1) array))
 	 (data-vector-ref array index)))))
 
@@ -79,7 +66,7 @@
     (let ((dims (array-type-dimensions array-type)))
       (when (or (atom dims) (= (length dims) 1))
         (give-up-ir1-transform))
-      (let ((el-type (array-type-element-type array-type))
+      (let ((el-type (array-type-specialized-element-type array-type))
             (total-size (if (member '* dims)
                             '*
                             (reduce #'* dims))))
@@ -100,22 +87,10 @@
        "Upgraded element type of array is not known at compile time."))
     (let ((element-type-specifier (type-specifier element-ctype)))
       `(multiple-value-bind (array index)
-	   ;; FIXME: All this noise should move into a
-	   ;; %DATA-VECTOR-AND-INDEX function, and there should be
-	   ;; DEFTRANSFORMs for %DATA-VECTOR-AND-INDEX to optimize the
-	   ;; function call away when the array is known to be simple,
-	   ;; and to specialize to
-	   ;; %DATA-VECTOR-AND-INDEX-IN-VECTOR-CASE when the array is
-	   ;; known to have only one dimension.
-	   (if (array-header-p array)
-	       (%with-array-data array index nil)
-	       (let ((array array))
-		 (declare (type (simple-array ,element-type-specifier 1)
-				array))
-		 (%check-bound array 0 index)
-		 (values array index)))
-	 (data-vector-set (truly-the (simple-array ,element-type-specifier 1)
-				     array)
+	   (%data-vector-and-index array index)
+	 (declare (type (simple-array ,element-type-specifier 1) array)
+	          (type ,element-type-specifier new-value))
+	 (data-vector-set array
 			  index
 			  new-value)))))
 
@@ -127,7 +102,7 @@
     (let ((dims (array-type-dimensions array-type)))
       (when (or (atom dims) (= (length dims) 1))
         (give-up-ir1-transform))
-      (let ((el-type (array-type-element-type array-type))
+      (let ((el-type (array-type-specialized-element-type array-type))
             (total-size (if (member '* dims)
                             '*
                             (reduce #'* dims))))
@@ -137,6 +112,29 @@
                           index
                           new-value)))))
 
+(defoptimizer (%data-vector-and-index derive-type) ((array index))
+  (let ((atype (continuation-type array)))
+    (when (array-type-p atype)
+      (values-specifier-type
+       `(values (simple-array ,(type-specifier
+                                (array-type-specialized-element-type atype))
+                              (*))
+                index)))))
+
+(deftransform %data-vector-and-index ((array index)
+                                     (simple-array t)
+                                     *
+                                     :important t)
+
+  ;; We do this solely for the -OR-GIVE-UP side effect, since we want
+  ;; to know that the type can be figured out in the end before we
+  ;; proceed, but we don't care yet what the type will turn out to be.
+  (upgraded-element-type-specifier-or-give-up array)
+
+  '(if (array-header-p array)
+       (values (%array-data-vector array) index)
+       (values array index)))
+
 ;;; transforms for getting at simple arrays of (UNSIGNED-BYTE N) when (< N 8)
 ;;;
 ;;; FIXME: In CMU CL, these were commented out with #+NIL. Why? Should