1.0.8.25: refactor CAN-OPTIMIZE-ACCESS usage and interface

[sbcl.git] / src / pcl / braid.lisp

diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp
index 6f956ce..5fcad4d 100644 (file)
--- a/src/pcl/braid.lisp
+++ b/src/pcl/braid.lisp
@@ -309,7 +309,8 @@
                                  structure-class condition-class
                                  slot-class))
       (set-slot 'direct-slots direct-slots)
-      (set-slot 'slots slots))
+      (set-slot 'slots slots)
+      (set-slot 'slot-vector (make-slot-vector slots)))
 
     ;; For all direct superclasses SUPER of CLASS, make sure CLASS is
     ;; a direct subclass of SUPER.  Note that METACLASS-NAME doesn't
@@ -516,16 +517,12 @@
                                        (cons name cpl)
                                        wrapper prototype))))))
 \f
-(defmacro wrapper-of-macro (x)
-  `(layout-of ,x))
-
-(defun class-of (x)
-  (wrapper-class* (wrapper-of-macro x)))
-
-;;; FIXME: We probably don't need both WRAPPER-OF and WRAPPER-OF-MACRO.
 #-sb-fluid (declaim (inline wrapper-of))
 (defun wrapper-of (x)
-  (wrapper-of-macro x))
+  (layout-of x))
+
+(defun class-of (x)
+  (wrapper-class* (wrapper-of x)))
 
 (defun eval-form (form)
   (lambda () (eval form)))