X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-type.lisp;h=0c254486a4f15e9e5c08ebe9bcd9feb61e30be14;hb=104ee7ee303efa16e415f5e75df635ac54dba733;hp=d08beccc677987d590dd25c5207db5a8422cdcd9;hpb=be9eb6c67b5f43a095c3de17bea945c309d662e4;p=sbcl.git

diff --git a/src/code/target-type.lisp b/src/code/target-type.lisp
index d08becc..0c25448 100644
--- a/src/code/target-type.lisp
+++ b/src/code/target-type.lisp
@@ -13,17 +13,6 @@
 
 (!begin-collecting-cold-init-forms)
 
-;;; Just call %TYPEP.
-;;;
-;;; Note that when cross-compiling, SB!XC:TYPEP is interpreted as
-;;; a test that the host Lisp object OBJECT translates to a target SBCL
-;;; type TYPE. (This behavior is needed e.g. to test for the validity of
-;;; numeric subtype bounds read when cross-compiling.)
-(defun typep (object type)
-  #!+sb-doc
-  "Return T iff OBJECT is of type TYPE."
-  (%typep object type))
-
 ;;; If TYPE is a type that we can do a compile-time test on, then
 ;;; return whether the object is of that type as the first value and
 ;;; second value true. Otherwise return NIL, NIL.
@@ -117,7 +106,7 @@
 	   ;; time), we need to suppress a DEFTRANSFORM.. -- WHN 19991004
 	   (declare (notinline sb!xc:find-class))
 	   (class-layout (sb!xc:find-class 'null))))
-	(t (svref *built-in-class-codes* (get-type x)))))
+	(t (svref *built-in-class-codes* (widetag-of x)))))
 
 #!-sb-fluid (declaim (inline sb!xc:class-of))
 (defun sb!xc:class-of (object)
@@ -128,7 +117,7 @@
 
 ;;; Pull the type specifier out of a function object.
 (defun extract-fun-type (fun)
-  (specifier-type (%fun-type (%closure-function fun))))
+  (specifier-type (%simple-fun-type (%closure-fun fun))))
 
 ;;;; miscellaneous interfaces