X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefbangstruct.lisp;h=7b9ba18776eee2825101945d44d6a2b408aaf773;hb=d76c81b0ca4dcfc99f0cd805f5c20493fa80b2b6;hp=7a8d3aef938f4f2093d50f7c25facad6628f1ed3;hpb=d202a453b45430e04671b966c01bc067c2667442;p=sbcl.git

diff --git a/src/code/defbangstruct.lisp b/src/code/defbangstruct.lisp
index 7a8d3ae..7b9ba18 100644
--- a/src/code/defbangstruct.lisp
+++ b/src/code/defbangstruct.lisp
@@ -104,7 +104,7 @@
   ;; DEF!STRUCT is made to work fully, this list is processed, then
   ;; made unbound, and should no longer be used.
   (defvar *delayed-def!structs* nil))
-(eval-when (:compile-toplevel :load-toplevel :execute)
+(eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute)
   ;; Parse the arguments for a DEF!STRUCT call, and return
   ;;   (VALUES NAME DEFSTRUCT-ARGS MAKE-LOAD-FORM-FUN DEF!STRUCT-SUPERTYPE),
   ;; where NAME is the name of the new type, DEFSTRUCT-ARGS is the
@@ -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))