1.0.13.40: CLASS-SLOTS signals an error for unfinalized classes

[sbcl.git] / src / pcl / std-class.lisp

diff --git a/src/pcl/std-class.lisp b/src/pcl/std-class.lisp
index cdffa52..ebfe865 100644 (file)
--- a/src/pcl/std-class.lisp
+++ b/src/pcl/std-class.lisp
@@ -99,16 +99,15 @@
                                        type gf)
   (let* ((name (slot-value slotd 'name))
          (class (slot-value slotd '%class))
-         (old-slotd (find-slot-definition class name))
+         (old-slotd (when (class-finalized-p class)
+                      (find-slot-definition class name)))
          (old-std-p (and old-slotd (slot-accessor-std-p old-slotd 'all))))
     (multiple-value-bind (function std-p)
         (if (eq *boot-state* 'complete)
             (get-accessor-method-function gf type class slotd)
             (get-optimized-std-accessor-method-function class slotd type))
       (setf (slot-accessor-std-p slotd type) std-p)
-      (setf (slot-accessor-function slotd type) function))
-    (when (and old-slotd (not (eq old-std-p (slot-accessor-std-p slotd 'all))))
-      (push (cons class name) *pv-table-cache-update-info*))))
+      (setf (slot-accessor-function slotd type) function))))
 
 (defmethod slot-definition-allocation ((slotd structure-slot-definition))
   :instance)
@@ -535,8 +534,8 @@
       (setq cpl-available-p t)
       (add-direct-subclasses class direct-superclasses)
       (let ((slots (compute-slots class)))
-        (setf (slot-value class 'slots) slots
-              (slot-value class 'slot-vector) (make-slot-vector slots)))))
+        (setf (slot-value class 'slots) slots)
+        (setf (layout-slot-table wrapper) (make-slot-table class slots)))))
   ;; Comment from Gerd's PCL, 2003-05-15:
   ;;
   ;; We don't ADD-SLOT-ACCESSORS here because we don't want to
@@ -550,7 +549,7 @@
   ;; remove slot accessors but never put them back.  I've added a
   ;; REINITIALIZE-INSTANCE :AFTER (CONDITION-CLASS) method, but what
   ;; was meant to happen?  -- CSR, 2005-11-18
-  (update-pv-table-cache-info class))
+  )
 
 (defmethod direct-slot-definition-class ((class condition-class)
                                          &rest initargs)
@@ -717,13 +716,13 @@
           (compute-class-precedence-list class))
     (setf (slot-value class 'cpl-available-p) t)
     (let ((slots (compute-slots class)))
-      (setf (slot-value class 'slots) slots
-            (slot-value class 'slot-vector) (make-slot-vector slots)))
-    (let ((lclass (find-classoid (class-name class))))
-      (setf (classoid-pcl-class lclass) class)
-      (setf (slot-value class 'wrapper) (classoid-layout lclass)))
+      (setf (slot-value class 'slots) slots)
+      (let* ((lclass (find-classoid (class-name class)))
+             (layout (classoid-layout lclass)))
+        (setf (classoid-pcl-class lclass) class)
+        (setf (slot-value class 'wrapper) layout)
+        (setf (layout-slot-table layout) (make-slot-table class slots))))
     (setf (slot-value class 'finalized-p) t)
-    (update-pv-table-cache-info class)
     (add-slot-accessors class direct-slots)))
 
 (defmethod direct-slot-definition-class ((class structure-class) &rest initargs)
@@ -895,10 +894,10 @@
 
       (update-lisp-class-layout class nwrapper)
       (setf (slot-value class 'slots) eslotds
-            (slot-value class 'slot-vector) (make-slot-vector eslotds)
+            (wrapper-slot-table nwrapper) (make-slot-table class eslotds)
             (wrapper-instance-slots-layout nwrapper) nlayout
             (wrapper-class-slots nwrapper) nwrapper-class-slots
-            (layout-length nwrapper) nslots
+            (wrapper-length nwrapper) nslots
             (slot-value class 'wrapper) nwrapper)
       (do* ((slots (slot-value class 'slots) (cdr slots))
             (dupes nil))
@@ -920,7 +919,6 @@
                      :test #'string= :key #'car))))
       (setf (slot-value class 'finalized-p) t)
       (unless (eq owrapper nwrapper)
-        (update-pv-table-cache-info class)
         (maybe-update-standard-class-locations class)))))
 
 (defun compute-class-slots (eslotds)
@@ -1278,6 +1276,8 @@
               (wrapper-instance-slots-layout owrapper))
         (setf (wrapper-class-slots nwrapper)
               (wrapper-class-slots owrapper))
+        (setf (wrapper-slot-table nwrapper)
+              (wrapper-slot-table owrapper))
         (with-pcl-lock
           (update-lisp-class-layout class nwrapper)
           (setf (slot-value class 'wrapper) nwrapper)
@@ -1309,6 +1309,8 @@
           (wrapper-instance-slots-layout owrapper))
     (setf (wrapper-class-slots nwrapper)
           (wrapper-class-slots owrapper))
+    (setf (wrapper-slot-table nwrapper)
+          (wrapper-slot-table owrapper))
     (with-pcl-lock
         (update-lisp-class-layout class nwrapper)
       (setf (slot-value class 'wrapper) nwrapper)
@@ -1557,11 +1559,6 @@
   (def class-direct-default-initargs)
   (def class-default-initargs))
 
-(defmethod class-slot-vector (class)
-  ;; Default method to cause FIND-SLOT-DEFINITION return NIL for all
-  ;; non SLOT-CLASS classes.
-  #(nil))
-
 (defmethod validate-superclass ((c class) (s built-in-class))
   (or (eq s *the-class-t*) (eq s *the-class-stream*)
       ;; FIXME: bad things happen if someone tries to mix in both