1.0.18.1: correct handling of SATISFIES types in the compiler

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

diff --git a/src/code/target-type.lisp b/src/code/target-type.lisp
index aa7b7a1..a3775fb 100644 (file)
--- a/src/code/target-type.lisp
+++ b/src/code/target-type.lisp
@@ -33,14 +33,14 @@
          named-type
          member-type
          array-type
-        character-set-type
+         character-set-type
          built-in-classoid
          cons-type)
      (values (%typep obj type) t))
     (classoid
-     (if (if (csubtypep type (specifier-type 'funcallable-instance))
+     (if (if (csubtypep type (specifier-type 'function))
              (funcallable-instance-p obj)
-             (typep obj 'instance))
+             (%instancep obj))
          (if (eq (classoid-layout type)
                  (info :type :compiler-layout (classoid-name type)))
              (values (sb!xc:typep obj type) t)
@@ -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)))))))))
 \f
 ;;; Return the layout for an object. This is the basic operation for
 ;;; finding out the "type" of an object, and is used for generic
@@ -119,19 +100,22 @@
 #!-sb-fluid (declaim (inline layout-of))
 (defun layout-of (x)
   (declare (optimize (speed 3) (safety 0)))
-  (cond ((typep x 'instance) (%instance-layout x))
+  (cond ((%instancep x) (%instance-layout x))
         ((funcallable-instance-p x) (%funcallable-instance-layout x))
         ((null x)
          ;; Note: was #.((CLASS-LAYOUT (SB!XC:FIND-CLASS 'NULL))).
          ;; I (WHN 19990209) replaced this with an expression evaluated at
          ;; run time in order to make it easier to build the cross-compiler.
-         ;; If it doesn't work, something else will be needed..
-         (locally
-           ;; KLUDGE: In order to really make this run at run time
-           ;; (instead of doing some weird broken thing at cold load
-           ;; time), we need to suppress a DEFTRANSFORM.. -- WHN 19991004
-           (declare (notinline find-classoid))
-           (classoid-layout (find-classoid 'null))))
+         ;;
+         ;; KLUDGE: Since there's a DEFTRANSFORM for FIND-CLASSOID on
+         ;; constant names which creates non-cold-loadable code, we
+         ;; can't just use (CLASSOID-LAYOUT (FIND-CLASSOID 'NULL))
+         ;; here. The original (WHN 19991004) solution was to locally
+         ;; notinline FIND-CLASSOID. However, the full call to
+         ;; FIND-CLASSOID caused suboptimal register allocation in PCL
+         ;; dfuns. So instead we now use a special variable which is
+         ;; initialized during cold init. -- JES, 2006-07-04
+         *null-classoid-layout*)
         (t (svref *built-in-class-codes* (widetag-of x)))))
 
 #!-sb-fluid (declaim (inline classoid-of))
@@ -140,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))))
 \f
 ;;;; miscellaneous interfaces
 
@@ -179,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