X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fgeneric%2Fvm-type.lisp;h=9c50878187e5c5b0f0a7369dda9aeb39a968a73a;hb=6f20436c86e66946ae1d2d3f4aef409c9845536b;hp=091475c953d7aed5894c8ec21f9580612e9f2743;hpb=545fa4548b327804cf78afe38a2ecd94ced86162;p=sbcl.git

diff --git a/src/compiler/generic/vm-type.lisp b/src/compiler/generic/vm-type.lisp
index 091475c..9c50878 100644
--- a/src/compiler/generic/vm-type.lisp
+++ b/src/compiler/generic/vm-type.lisp
@@ -24,9 +24,9 @@
 
 ;;;; implementation-dependent DEFTYPEs
 
-;;; Make DOUBLE-FLOAT a synonym for LONG-FLOAT, SINGLE-FLOAT for SHORT-FLOAT.
-;;; This is expanded before the translator gets a chance, so we will get
-;;; precedence.
+;;; Make DOUBLE-FLOAT a synonym for LONG-FLOAT, SINGLE-FLOAT for
+;;; SHORT-FLOAT. This is expanded before the translator gets a chance,
+;;; so we will get precedence.
 #!-long-float
 (setf (info :type :kind 'long-float) :defined)
 #!-long-float
@@ -82,7 +82,8 @@
 (defvar *specialized-array-element-types*)
 (!cold-init-forms
   (setf *specialized-array-element-types*
-	'(bit
+	'(nil
+	  bit
 	  (unsigned-byte 2)
 	  (unsigned-byte 4)
 	  (unsigned-byte 8)
@@ -130,7 +131,12 @@
 (defun specialize-array-type (type)
   (let ((eltype (array-type-element-type type)))
     (setf (array-type-specialized-element-type type)
-	  (if (eq eltype *wild-type*)
+	  (if (or (eq eltype *wild-type*)
+		  ;; This is slightly dubious, but not as dubious as
+		  ;; assuming that the upgraded-element-type should be
+		  ;; equal to T, given the way that the AREF
+		  ;; DERIVE-TYPE optimizer works.  -- CSR, 2002-08-19
+		  (unknown-type-p eltype))
 	      *wild-type*
 	      (dolist (stype-name *specialized-array-element-types*
 				  *universal-type*)
@@ -164,7 +170,7 @@
      (if (type= type (specifier-type 'cons))
 	 'sb!c:check-cons
 	 nil))
-    (built-in-class
+    (built-in-classoid
      (if (type= type (specifier-type 'symbol))
 	 'sb!c:check-symbol
 	 nil))
@@ -177,7 +183,7 @@
 	    'sb!c:check-unsigned-byte-32)
 	   (t nil)))
     (fun-type
-     'sb!c:check-function)
+     'sb!c:check-fun)
     (t
      nil)))