0.pre7.113:

[sbcl.git] / src / code / target-type.lisp

diff --git a/src/code/target-type.lisp b/src/code/target-type.lisp
index 0a9e068..0c25448 100644 (file)
--- a/src/code/target-type.lisp
+++ b/src/code/target-type.lisp
@@ -13,17 +13,6 @@
 
 (!begin-collecting-cold-init-forms)
 \f
-;;; 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.
@@ -63,7 +52,7 @@
              #'ctypep
              obj
              (compound-type-types type)))
-    (function-type
+    (fun-type
      (values (functionp obj) t))
     (unknown-type
      (values 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)
@@ -127,14 +116,8 @@
   (layout-class (layout-of object)))
 
 ;;; Pull the type specifier out of a function object.
-(defun extract-function-type (fun)
-  (if (sb!eval:interpreted-function-p fun)
-      (sb!eval:interpreted-function-type fun)
-      (typecase fun
-       (byte-function (byte-function-type fun))
-       (byte-closure (byte-function-type (byte-closure-function fun)))
-       (t
-        (specifier-type (%function-type (%closure-function fun)))))))
+(defun extract-fun-type (fun)
+  (specifier-type (%simple-fun-type (%closure-fun fun))))
 \f
 ;;;; miscellaneous interfaces
 
@@ -166,7 +149,7 @@
     (function
      (if (funcallable-instance-p x)
         (sb!xc:class-of x)
-        (extract-function-type x)))
+        (extract-fun-type x)))
     (symbol
      (make-member-type :members (list x)))
     (number