X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-type.lisp;h=9c50878187e5c5b0f0a7369dda9aeb39a968a73a;hb=6a756846fe0fe89835ec5eb68327b612c93f82c4;hp=9dcf76de00e3e5239abeec25878486883795dd7b;hpb=ce02ab2ecd9c6ae2e570abd8c93ebf3be55bbdad;p=sbcl.git

diff --git a/src/compiler/generic/vm-type.lisp b/src/compiler/generic/vm-type.lisp
index 9dcf76d..9c50878 100644
--- a/src/compiler/generic/vm-type.lisp
+++ b/src/compiler/generic/vm-type.lisp
@@ -20,13 +20,13 @@
 
 ;;;; FIXME: I'm not sure where to put this. -- WHN 19990817
 
-(deftype sb!vm:word () `(unsigned-byte ,sb!vm:word-bits))
+(deftype sb!vm:word () `(unsigned-byte ,sb!vm:n-word-bits))
 
 ;;;; 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
@@ -72,7 +72,7 @@
 ;;; internal time format. (Note: not a FIXNUM, ouch..)
 (sb!xc:deftype internal-time () 'unsigned-byte)
 
-(sb!xc:deftype bignum-element-type () `(unsigned-byte ,sb!vm:word-bits))
+(sb!xc:deftype bignum-element-type () `(unsigned-byte ,sb!vm:n-word-bits))
 (sb!xc:deftype bignum-type () 'bignum)
 (sb!xc:deftype bignum-index () 'index)
 
@@ -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,11 +131,15 @@
 (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*
-				  ;; FIXME: Use *UNIVERSAL-TYPE* here?
-				  (specifier-type 't))
+				  *universal-type*)
 		;; FIXME: Mightn't it be better to have
 		;; *SPECIALIZED-ARRAY-ELEMENT-TYPES* be stored as precalculated
 		;; SPECIFIER-TYPE results, instead of having to calculate
@@ -165,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,8 +182,8 @@
 	   ((type= type (specifier-type '(unsigned-byte 32)))
 	    'sb!c:check-unsigned-byte-32)
 	   (t nil)))
-    (function-type
-     'sb!c:check-function)
+    (fun-type
+     'sb!c:check-fun)
     (t
      nil)))