X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ftypetran.lisp;h=a63f23afcc181014aeb077716d3cc2b2de524825;hb=cd2c70c8b5d4dcc62b968f5a9bedd3c9c8698e82;hp=228bce0b03bad4f1b09ef9d846e37c1b404503f6;hpb=ed7ba4dad8a79726fdfeba5aa12e276ea852c540;p=sbcl.git

diff --git a/src/compiler/typetran.lisp b/src/compiler/typetran.lisp
index 228bce0..a63f23a 100644
--- a/src/compiler/typetran.lisp
+++ b/src/compiler/typetran.lisp
@@ -72,6 +72,8 @@
 	   nil)
 	  ((csubtypep otype type)
 	   t)
+          ((eq type *empty-type*)
+           nil)
 	  (t
 	   (give-up-ir1-transform)))))
 
@@ -81,7 +83,7 @@
     (give-up-ir1-transform))
   (ir1-transform-type-predicate
    object
-   (specifier-type (continuation-value type))))
+   (ir1-transform-specifier-type (continuation-value type))))
 
 ;;; This is the IR1 transform for simple type predicates. It checks
 ;;; whether the single argument is known to (not) be of the
@@ -97,8 +99,7 @@
 
 ;;; If FIND-CLASS is called on a constant class, locate the CLASS-CELL
 ;;; at load time.
-(deftransform find-class ((name) ((constant-argument symbol)) *
-			  :when :both)
+(deftransform find-class ((name) ((constant-arg symbol)) *)
   (let* ((name (continuation-value name))
 	 (cell (find-class-cell name)))
     `(or (class-cell-class ',cell)
@@ -385,7 +386,7 @@
 ;;; then we also check whether the layout for the object is invalid
 ;;; and signal an error if so. Otherwise, look up the indirect
 ;;; class-cell and call CLASS-CELL-TYPEP at runtime.
-(deftransform %instance-typep ((object spec) (* *) * :node node :when :both)
+(deftransform %instance-typep ((object spec) (* *) * :node node)
   (aver (constant-continuation-p spec))
   (let* ((spec (continuation-value spec))
 	 (class (specifier-type spec))
@@ -493,8 +494,12 @@
   ;; source transform another chance, so it all works out OK, in a
   ;; weird roundabout way. -- WHN 2001-03-18
   (if (and (consp spec) (eq (car spec) 'quote))
-      (let ((type (specifier-type (cadr spec))))
-	(or (let ((pred (cdr (assoc type *backend-type-predicates*
+      (let ((type (careful-specifier-type (cadr spec))))
+	(or (when (not type)
+              (compiler-warn "illegal type specifier for TYPEP: ~S"
+                             (cadr spec))
+              `(%typep ,object ,spec))
+            (let ((pred (cdr (assoc type *backend-type-predicates*
 				    :test #'type=))))
 	      (when pred `(,pred ,object)))
 	    (typecase type
@@ -507,8 +512,8 @@
 	      (member-type
 	       `(member ,object ',(member-type-members type)))
 	      (args-type
-	       (compiler-warning "illegal type specifier for TYPEP: ~S"
-				 (cadr spec))
+	       (compiler-warn "illegal type specifier for TYPEP: ~S"
+			      (cadr spec))
 	       `(%typep ,object ,spec))
 	      (t nil))
 	    (typecase type
@@ -526,10 +531,10 @@
 
 ;;;; coercion
 
-(deftransform coerce ((x type) (* *) * :when :both)
+(deftransform coerce ((x type) (* *) * :node node)
   (unless (constant-continuation-p type)
     (give-up-ir1-transform))
-  (let ((tspec (specifier-type (continuation-value type))))
+  (let ((tspec (ir1-transform-specifier-type (continuation-value type))))
     (if (csubtypep (continuation-type x) tspec)
 	'x
 	;; Note: The THE here makes sure that specifiers like
@@ -537,12 +542,16 @@
 	`(the ,(continuation-value type)
 	   ,(cond
 	     ((csubtypep tspec (specifier-type 'double-float))
-	      '(%double-float x))	
+	      '(%double-float x))
 	     ;; FIXME: #!+long-float (t ,(error "LONG-FLOAT case needed"))
 	     ((csubtypep tspec (specifier-type 'float))
 	      '(%single-float x))
-	     ((csubtypep tspec (specifier-type 'simple-vector))
-	      '(coerce-to-simple-vector x))
+	     ((and (csubtypep tspec (specifier-type 'simple-vector))
+		   (policy node (< safety 3)))
+	      `(if (simple-vector-p x)
+		   x
+		   (replace (make-array (length x)) x)))
+	     ;; FIXME: other VECTOR types?
 	     (t
 	      (give-up-ir1-transform)))))))