X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefstruct.lisp;h=ae83f975482072eb4a07fd3be14fc46efc27756b;hb=245101f127d61e28b9c864c720eb17973469a904;hp=e523eed815f28c8195df4f7b52087ff398790184;hpb=1b7fde9126d21b01f0d5359027242f8b5acdf9f8;p=sbcl.git

diff --git a/src/code/defstruct.lisp b/src/code/defstruct.lisp
index e523eed..ae83f97 100644
--- a/src/code/defstruct.lisp
+++ b/src/code/defstruct.lisp
@@ -685,12 +685,7 @@
 ;;;
 ;;; FIXME: This should use the data in *RAW-SLOT-DATA-LIST*.
 (defun structure-raw-slot-type-and-size (type)
-  (cond #+nil
-	(;; FIXME: For now we suppress raw slots, since there are various
-	 ;; issues about the way that the cross-compiler handles them.
-	 (not (boundp '*dummy-placeholder-to-stop-compiler-warnings*))
-	 (values nil nil nil))
-	((and (sb!xc:subtypep type '(unsigned-byte 32))
+  (cond ((and (sb!xc:subtypep type '(unsigned-byte 32))
 	      (multiple-value-bind (fixnum? fixnum-certain?)
 		  (sb!xc:subtypep type 'fixnum)
 		;; (The extra test for FIXNUM-CERTAIN? here is
@@ -889,8 +884,20 @@
 	  (multiple-value-bind (scaled-dsd-index misalignment)
 	      (floor (dsd-index dsd) raw-n-words)
 	    (aver (zerop misalignment))
-	    `(,raw-slot-accessor (,ref ,instance-name ,(dd-raw-index dd))
-				 ,scaled-dsd-index))))))
+	    (let* ((raw-vector-bare-form
+		    `(,ref ,instance-name ,(dd-raw-index dd)))
+		   (raw-vector-form
+		    (if (eq raw-type 'unsigned-byte)
+			(progn
+			  (aver (= raw-n-words 1))
+			  (aver (eq raw-slot-accessor 'aref))
+			  ;; FIXME: when the 64-bit world rolls
+			  ;; around, this will need to be reviewed,
+			  ;; along with the whole RAW-SLOT thing.
+			  `(truly-the (simple-array (unsigned-byte 32) (*))
+			              ,raw-vector-bare-form))
+			raw-vector-bare-form)))
+	      `(,raw-slot-accessor ,raw-vector-form ,scaled-dsd-index)))))))
 
 ;;; Return source transforms for the reader and writer functions of
 ;;; the slot described by DSD. They should be inline expanded, but
@@ -1435,17 +1442,26 @@
     (unless (or defaults boas)
       (push (symbolicate "MAKE-" (dd-name defstruct)) defaults))
 
-    (collect ((res))
+    (collect ((res) (names))
       (when defaults
-	(let ((cname (first defaults)))
-	  (setf (dd-default-constructor defstruct) cname)
-	  (res (create-keyword-constructor defstruct creator))
-	  (dolist (other-name (rest defaults))
-	    (res `(setf (fdefinition ',other-name) (fdefinition ',cname)))
-	    (res `(declaim (ftype function ',other-name))))))
+        (let ((cname (first defaults)))
+          (setf (dd-default-constructor defstruct) cname)
+          (res (create-keyword-constructor defstruct creator))
+          (names cname)
+          (dolist (other-name (rest defaults))
+            (res `(setf (fdefinition ',other-name) (fdefinition ',cname)))
+            (names other-name))))
 
       (dolist (boa boas)
-	(res (create-boa-constructor defstruct boa creator)))
+        (res (create-boa-constructor defstruct boa creator))
+        (names (first boa)))
+
+      (res `(declaim (ftype
+                      (sfunction *
+                                 ,(if (eq (dd-type defstruct) 'structure)
+                                      (dd-name defstruct)
+                                      '*))
+                      ,@(names))))
 
       (res))))