X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-type.lisp;h=a3775fb56eb7b67f6f98ee6a5e6e884753f12240;hb=95591ed483dbb8c0846c129953acac1554f28809;hp=4ae6003f3ff8c9d7819d599f96fbbd8d2125fabc;hpb=dbfdac9e56e044b1df898bcb7e1763997b03efa2;p=sbcl.git

diff --git a/src/code/target-type.lisp b/src/code/target-type.lisp
index 4ae6003..a3775fb 100644
--- a/src/code/target-type.lisp
+++ b/src/code/target-type.lisp
@@ -85,30 +85,11 @@
                 (values (not res) t)
                 (values nil nil))))
          (satisfies
-          (let ((predicate-name (second hairy-spec)))
-            (declare (type symbol predicate-name)) ; by ANSI spec of SATISFIES
-            (if (fboundp predicate-name)
-                (let* (;; "Is OBJ of the SATISFIES type?" represented
-                       ;; as a generalized boolean.
-                       ;;
-                       ;; (Why IGNORE-ERRORS? This code is used to try to
-                       ;; check type relationships at compile time.
-                       ;; Passing only-slightly-twisted types like
-                       ;; (AND INTEGER (SATISFIES ODDP)) into the
-                       ;; rather-significantly-twisted type dispatch
-                       ;; system can easily give rise to oddities like
-                       ;; calling predicates like ODDP on values they
-                       ;; don't like. (E.g. on OBJ=#\NEWLINE when the
-                       ;; above type is tested for TYPE= against
-                       ;; STANDARD-CHAR, represented as a
-                       ;; MEMBER-TYPE.) In such cases, NIL seems to be
-                       ;; an appropriate answer to "is OBJ of the
-                       ;; SATISFIES type?")
-                       (gbool (ignore-errors (funcall predicate-name obj)))
-                       ;; RAW coerced to a pure BOOLEAN value
-                       (bool (not (not gbool))))
-                  (values bool t))
-                (values nil nil)))))))))
+          ;; If the SATISFIES function is not foldable, we cannot answer!
+          (let* ((form `(,(second hairy-spec) ',obj)))
+            (multiple-value-bind (ok result)
+                (sb!c::constant-function-call-p form nil nil)
+              (values (not (null result)) ok)))))))))
 
 ;;; Return the layout for an object. This is the basic operation for
 ;;; finding out the "type" of an object, and is used for generic
@@ -143,10 +124,6 @@
   "Return the class of the supplied object, which may be any Lisp object, not
    just a CLOS STANDARD-OBJECT."
   (layout-classoid (layout-of object)))
-
-;;; Pull the type specifier out of a function object.
-(defun extract-fun-type (fun)
-  (specifier-type (%simple-fun-type (%closure-fun fun))))
 
 ;;;; miscellaneous interfaces
 
@@ -182,7 +159,7 @@
     (function
      (if (funcallable-instance-p x)
          (classoid-of x)
-         (extract-fun-type x)))
+         (specifier-type (sb!impl::%fun-type x))))
     (symbol
      (make-member-type :members (list x)))
     (number