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

diff --git a/src/code/defstruct.lisp b/src/code/defstruct.lisp
index feec05a..391aae1 100644
--- a/src/code/defstruct.lisp
+++ b/src/code/defstruct.lisp
@@ -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
@@ -805,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
 
@@ -986,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)