0.7.13.pcl-class.1

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

diff --git a/src/code/defbangstruct.lisp b/src/code/defbangstruct.lisp
index db3965a..ea2939e 100644 (file)
--- a/src/code/defbangstruct.lisp
+++ b/src/code/defbangstruct.lisp
@@ -76,8 +76,8 @@
 (defun just-dump-it-normally (object &optional (env nil env-p))
   (declare (type structure!object object))
   (if env-p
-      (make-load-form-saving-slots object :environment env)
-      (make-load-form-saving-slots object)))
+      (sb!xc:make-load-form-saving-slots object :environment env)
+      (sb!xc:make-load-form-saving-slots object)))
 
 ;;; a MAKE-LOAD-FORM function for objects which don't use the load
 ;;; form system. This is used for LAYOUT objects because the special
@@ -118,6 +118,7 @@
        (if (consp nameoid)
            (values (first nameoid) (rest nameoid))
            (values nameoid nil))
+      (declare (type list options))
       (let* ((include-clause (find :include options :key #'first))
             (def!struct-supertype nil) ; may change below
             (mlff-clause (find :make-load-form-fun options :key #'first))
@@ -144,11 +145,11 @@
 (progn
   (defun %instance-length (instance)
     (aver (typep instance 'structure!object))
-    (layout-length (class-layout (sb!xc:find-class (type-of instance)))))
+    (layout-length (classoid-layout (find-classoid (type-of instance)))))
   (defun %instance-ref (instance index)
     (aver (typep instance 'structure!object))
-    (let* ((class (sb!xc:find-class (type-of instance)))
-          (layout (class-layout class)))
+    (let* ((class (find-classoid (type-of instance)))
+          (layout (classoid-layout class)))
       (if (zerop index)
          layout
          (let* ((dd (layout-info layout))
@@ -158,8 +159,8 @@
            (funcall accessor-name instance)))))
   (defun %instance-set (instance index new-value)
     (aver (typep instance 'structure!object))
-    (let* ((class (sb!xc:find-class (type-of instance)))
-          (layout (class-layout class)))
+    (let* ((class (find-classoid (type-of instance)))
+          (layout (classoid-layout class)))
       (if (zerop index)
          (error "can't set %INSTANCE-REF FOO 0 in cross-compilation host")
          (let* ((dd (layout-info layout))