0.pre7.55:

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

diff --git a/src/code/target-type.lisp b/src/code/target-type.lisp
index 0a9e068..fcbc479 100644 (file)
--- a/src/code/target-type.lisp
+++ b/src/code/target-type.lisp
@@ -63,7 +63,7 @@
              #'ctypep
              obj
              (compound-type-types type)))
-    (function-type
+    (fun-type
      (values (functionp obj) t))
     (unknown-type
      (values nil nil))
@@ -127,14 +127,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 +160,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