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

diff --git a/src/code/defstruct.lisp b/src/code/defstruct.lisp
index e523eed..391aae1 100644
--- a/src/code/defstruct.lisp
+++ b/src/code/defstruct.lisp
@@ -49,7 +49,7 @@
 	   ;; slow, so if anyone cares about performance of
 	   ;; non-toplevel DEFSTRUCTs, it should be rewritten to be
 	   ;; cleverer. -- WHN 2002-10-23
-	   (sb!c::compiler-note
+	   (sb!c:compiler-notify
 	    "implementation limitation: ~
              Non-toplevel DEFSTRUCT constructors are slow.")
 	   (with-unique-names (layout)
@@ -455,7 +455,7 @@
 	  (let ((inherited (accessor-inherited-data name defstruct)))
 	    (cond
 	      ((not inherited)
-	       (stuff `(proclaim '(inline ,name (setf ,name))))
+	       (stuff `(declaim (inline ,name (setf ,name))))
 	       ;; FIXME: The arguments in the next two DEFUNs should
 	       ;; be gensyms. (Otherwise e.g. if NEW-VALUE happened to
 	       ;; be the name of a special variable, things could get
@@ -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
@@ -810,9 +805,16 @@
 			   (dsd-index included-slot))
 		     (dd-inherited-accessor-alist dd)
 		     :test #'eq :key #'car))
-	  (parse-1-dsd dd
-		       modified
-		       (copy-structure included-slot)))))))
+	  (let ((new-slot (parse-1-dsd dd
+                                       modified
+                                       (copy-structure included-slot))))
+            (when (and (neq (dsd-type new-slot) (dsd-type included-slot))
+                       (not (subtypep (dsd-type included-slot)
+                                      (dsd-type new-slot)))
+                       (dsd-safe-p included-slot))
+              (setf (dsd-safe-p new-slot) nil)
+              ;; XXX: notify?
+              )))))))
 
 ;;;; various helper functions for setting up DEFSTRUCTs
 
@@ -889,8 +891,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
@@ -979,7 +993,7 @@
 
     (let ((predicate-name (dd-predicate-name dd)))
       (when predicate-name
-	(sb!xc:proclaim `(ftype (sfunction (t) t) ,predicate-name))
+	(sb!xc:proclaim `(ftype (sfunction (t) boolean) ,predicate-name))
 	;; Provide inline expansion (or not).
 	(ecase (dd-type dd)
 	  ((structure funcallable-structure)
@@ -1435,17 +1449,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))))