X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-type.lisp;h=321d0a420ac8c9272b613a25ccce6a85a559e1f7;hb=854a7c8f6987e05b6aebe186f30b7e125693afaf;hp=aa7b7a16f12992faae7d7c431a18c545ac04e1d8;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git

diff --git a/src/code/target-type.lisp b/src/code/target-type.lisp
index aa7b7a1..321d0a4 100644
--- 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)
@@ -119,7 +119,7 @@
 #!-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))).