X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fseqtran.lisp;h=e7c0da32dc712564e577c5894d37ebb6c6530203;hb=ef11b09c41b1e344212f6a363892a849af7ff94e;hp=6b4f15484971d0092e0dea031b1412fa5c5ab8d7;hpb=34dd23563d2f5cf05c72b971da0d0b065a09bf2a;p=sbcl.git

diff --git a/src/compiler/seqtran.lisp b/src/compiler/seqtran.lisp
index 6b4f154..e7c0da3 100644
--- a/src/compiler/seqtran.lisp
+++ b/src/compiler/seqtran.lisp
@@ -214,13 +214,13 @@
 		      (declare (ignorable dacc))
 		      ,push-dacc))))))))))
 
-(deftransform elt ((s i) ((simple-array * (*)) *) * :when :both)
+(deftransform elt ((s i) ((simple-array * (*)) *) *)
   '(aref s i))
 
-(deftransform elt ((s i) (list *) * :when :both)
+(deftransform elt ((s i) (list *) *)
   '(nth i s))
 
-(deftransform %setelt ((s i v) ((simple-array * (*)) * *) * :when :both)
+(deftransform %setelt ((s i v) ((simple-array * (*)) * *) *)
   '(%aset s i v))
 
 (deftransform %setelt ((s i v) (list * *))
@@ -228,7 +228,7 @@
 
 (macrolet ((def (name)
              `(deftransform ,name ((e l &key (test #'eql)) * *
-				   :node node :when :both)
+				   :node node)
                 (unless (constant-continuation-p l)
                   (give-up-ir1-transform))
 
@@ -293,17 +293,22 @@
 		    :policy (> speed space))
   "open code"
   (let ((element-type (upgraded-element-type-specifier-or-give-up seq)))
-    `(with-array-data ((data seq)
-		       (start start)
-		       (end end))
+    (values 
+     `(with-array-data ((data seq)
+			(start start)
+			(end end))
        (declare (type (simple-array ,element-type 1) data))
+       (declare (type fixnum start end))
        (do ((i start (1+ i)))
 	   ((= i end) seq)
 	 (declare (type index i))
 	 ;; WITH-ARRAY-DATA did our range checks once and for all, so
-	 ;; it'd be wasteful to check again on every AREF.
+	 ;; it'd be wasteful to check again on every AREF...
 	 (declare (optimize (safety 0))) 
-	 (setf (aref data i) item)))))
+	 (setf (aref data i) item)))
+     ;; ... though we still need to check that the new element can fit
+     ;; into the vector in safe code. -- CSR, 2002-07-05
+     `((declare (type ,element-type item))))))
 
 ;;;; utilities
 
@@ -605,6 +610,15 @@
 ;;;; calls when all arguments are vectors with the same element type,
 ;;;; rather than restricting them to STRINGs only.
 
+;;; Moved here from generic/vm-tran.lisp to satisfy clisp
+;;;
+;;; FIXME: It would be good to implement SB!XC:DEFCONSTANT, and use
+;;; use that here, so that the compiler is born knowing this value.
+;;; FIXME: Add a comment telling whether this holds for all vectors
+;;; or only for vectors based on simple arrays (non-adjustable, etc.).
+(def!constant vector-data-bit-offset
+  (* sb!vm:vector-data-offset sb!vm:n-word-bits))
+
 ;;; FIXME: Shouldn't we be testing for legality of
 ;;;   * START1, START2, END1, and END2 indices?
 ;;;   * size of copied string relative to destination string?
@@ -638,6 +652,7 @@
 ;;; %CONCATENATE (with a DEFTRANSFORM to translate constant RTYPE to
 ;;; CTYPE before calling %CONCATENATE) which is comparably efficient,
 ;;; at least once DYNAMIC-EXTENT works.
+#+nil ; FIXME: currently commented out because of bug 188
 (deftransform concatenate ((rtype &rest sequences)
 			   (t &rest simple-string)
 			   simple-string)
@@ -646,7 +661,7 @@
 	    (all-lengths)
 	    (args))
     (dolist (seq sequences)
-      (declare (ignore seq))
+      (declare (ignorable seq))
       (let ((n-seq (gensym))
 	    (n-length (gensym)))
 	(args n-seq)