1.0.23.37: more CLOS and classoid thread safety

[sbcl.git] / src / code / typep.lisp

diff --git a/src/code/typep.lisp b/src/code/typep.lisp
index 49b3964..2e65f03 100644 (file)
--- a/src/code/typep.lisp
+++ b/src/code/typep.lisp
@@ -39,6 +39,7 @@
        ((* t) t)
        ((instance) (%instancep object))
        ((funcallable-instance) (funcallable-instance-p object))
+       ((extended-sequence) (extended-sequence-p object))
        ((nil) nil)))
     (numeric-type
      (and (numberp object)
@@ -104,7 +105,8 @@
                              (specifier-type (array-element-type
                                               object)))))))
     (member-type
-     (if (member object (member-type-members type)) t))
+     (when (member-type-member-p object type)
+       t))
     (classoid
      #+sb-xc-host (ctypep object type)
      #-sb-xc-host (classoid-typep (layout-of object) type object))
@@ -176,21 +178,20 @@
 ;;; Test whether OBJ-LAYOUT is from an instance of CLASSOID.
 (defun classoid-typep (obj-layout classoid object)
   (declare (optimize speed))
-  (when (layout-invalid obj-layout)
-    (if (and (typep (classoid-of object) 'standard-classoid) object)
-        (setq obj-layout (sb!pcl::check-wrapper-validity object))
-        (error "TYPEP was called on an obsolete object (was class ~S)."
-               (classoid-proper-name (layout-classoid obj-layout)))))
-  (let ((layout (classoid-layout classoid))
-        (obj-inherits (layout-inherits obj-layout)))
-    (when (layout-invalid layout)
-      (error "The class ~S is currently invalid." classoid))
-    (or (eq obj-layout layout)
-        (dotimes (i (length obj-inherits) nil)
-          (when (eq (svref obj-inherits i) layout)
-            (return t))))))
-
-;;; This implementation is a placeholder to use until PCL is set up,
-;;; at which time it will be overwritten by a real implementation.
-(defun sb!pcl::check-wrapper-validity (object)
-  object)
+  (with-world-lock ()
+    (multiple-value-bind (obj-layout layout)
+        (do ((layout (classoid-layout classoid) (classoid-layout classoid))
+             (i 0 (+ i 1))
+             (obj-layout obj-layout))
+            ((and (not (layout-invalid obj-layout))
+                  (not (layout-invalid layout)))
+             (values obj-layout layout))
+          (aver (< i 2))
+          (when (layout-invalid obj-layout)
+            (setq obj-layout (update-object-layout-or-invalid object layout)))
+          (%ensure-classoid-valid classoid layout))
+      (let ((obj-inherits (layout-inherits obj-layout)))
+        (or (eq obj-layout layout)
+            (dotimes (i (length obj-inherits) nil)
+              (when (eq (svref obj-inherits i) layout)
+                (return t))))))))