X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Farray-tran.lisp;h=0c52b81cd5ffcffd693e4bfa612f1f9b1815594a;hb=b63c4fb9b98fa8188e17ba926e150ba417a74635;hp=02cbb75d097322a154078c23e9033b7bbfb6f78d;hpb=a2feba471e773f549aa575586370adb5438856f2;p=sbcl.git

diff --git a/src/compiler/array-tran.lisp b/src/compiler/array-tran.lisp
index 02cbb75..0c52b81 100644
--- a/src/compiler/array-tran.lisp
+++ b/src/compiler/array-tran.lisp
@@ -242,11 +242,15 @@
 		 ((not (ctypep value (sb!vm:saetp-ctype saetp)))
 		  ;; this case will cause an error at runtime, so we'd
 		  ;; better WARN about it now.
-		  (compiler-warn "~@<~S is not a ~S (which is the ~
-                                 UPGRADED-ARRAY-ELEMENT-TYPE of ~S).~@:>"
-				 value
-				 (type-specifier (sb!vm:saetp-ctype saetp))
-				 eltype))
+		  (warn 'array-initial-element-mismatch
+			:format-control "~@<~S is not a ~S (which is the ~
+                                         ~S of ~S).~@:>"
+			:format-arguments 
+			(list 
+			 value
+			 (type-specifier (sb!vm:saetp-ctype saetp))
+			 'upgraded-array-element-type
+			 eltype)))
 		 ((not (ctypep value eltype-type))
 		  ;; this case will not cause an error at runtime, but
 		  ;; it's still worth STYLE-WARNing about.
@@ -289,8 +293,7 @@
       (give-up-ir1-transform
        "cannot open-code creation of ~S" result-type-spec))
     #-sb-xc-host
-    (unless (csubtypep (ctype-of (sb!vm:saetp-initial-element-default saetp))
-		       eltype-type)
+    (unless (ctypep (sb!vm:saetp-initial-element-default saetp) eltype-type)
       ;; This situation arises e.g. in (MAKE-ARRAY 4 :ELEMENT-TYPE
       ;; '(INTEGER 1 5)) ANSI's definition of MAKE-ARRAY says "If
       ;; INITIAL-ELEMENT is not supplied, the consequences of later
@@ -519,7 +522,7 @@
 	    ((:maybe)
 	     (give-up-ir1-transform
 	      "The array type is ambiguous; must call ~
-	      ARRAY-HAS-FILL-POINTER-P at runtime.")))))))
+               ARRAY-HAS-FILL-POINTER-P at runtime.")))))))
 
 ;;; Primitive used to verify indices into arrays. If we can tell at
 ;;; compile-time or we are generating unsafe code, don't bother with
@@ -634,7 +637,6 @@
 				;; WHN, and also CSR 2002-05-26
 				((or vector simple-array) index (or index null))
 				*
-				:important t
 				:node node
 				:policy (> speed space))
   "inline non-SIMPLE-vector-handling logic"
@@ -647,14 +649,20 @@
 
 ;;; We convert all typed array accessors into AREF and %ASET with type
 ;;; assertions on the array.
-(macrolet ((define-frob (reffer setter type)
+(macrolet ((define-bit-frob (reffer setter simplep)
 	     `(progn
 		(define-source-transform ,reffer (a &rest i)
-		  `(aref (the ,',type ,a) ,@i))
+		  `(aref (the (,',(if simplep 'simple-array 'array)
+				  bit
+				  ,(mapcar (constantly '*) i))
+			   ,a) ,@i))
 		(define-source-transform ,setter (a &rest i)
-		  `(%aset (the ,',type ,a) ,@i)))))
-  (define-frob sbit %sbitset (simple-array bit))
-  (define-frob bit %bitset (array bit)))
+		  `(%aset (the (,',(if simplep 'simple-array 'array)
+				   bit
+				   ,(cdr (mapcar (constantly '*) i)))
+			    ,a) ,@i)))))
+  (define-bit-frob sbit %sbitset t)
+  (define-bit-frob bit %bitset nil))
 (macrolet ((define-frob (reffer setter type)
 	     `(progn
 		(define-source-transform ,reffer (a i)
@@ -669,7 +677,7 @@
 	   ;; given a set of indices. We wrap each index with a call
 	   ;; to %CHECK-BOUND to ensure that everything works out
 	   ;; correctly. We can wrap all the interior arithmetic with
-	   ;; TRULY-THE INDEX because we know the the resultant
+	   ;; TRULY-THE INDEX because we know the resultant
 	   ;; row-major index must be an index.
 	   (with-row-major-index ((array indices index &optional new-value)
 				  &rest body)