X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-defstruct.lisp;h=858e452c01fd79301b14bbc6db9eadff6a019b03;hb=c716f6ea5255afeb33a1181535b5c067aa9d6aaa;hp=4d6f1cb37bcfac28bac579a68a35f6cfdb30b175;hpb=c713eb2b521b048ff2c927ec52b861787d289f85;p=sbcl.git

diff --git a/src/code/target-defstruct.lisp b/src/code/target-defstruct.lisp
index 4d6f1cb..858e452 100644
--- a/src/code/target-defstruct.lisp
+++ b/src/code/target-defstruct.lisp
@@ -213,11 +213,12 @@
 	    ((structure funcallable-structure)
 	     (/show0 "with-LAYOUT case")
 	     (lambda (object)
-	       (declare (optimize (speed 3) (safety 0)))
-	       (/noshow0 "in with-LAYOUT structure predicate closure, OBJECT,LAYOUT=..")
-	       (/nohexstr object)
-	       (/nohexstr layout)
-	       (typep-to-layout object layout)))
+	       (locally ; <- to keep SAFETY 0 from affecting arg count checking
+		 (declare (optimize (speed 3) (safety 0)))
+		 (/noshow0 "in with-LAYOUT structure predicate closure, OBJECT,LAYOUT=..")
+		 (/nohexstr object)
+		 (/nohexstr layout)
+		 (typep-to-layout object layout))))
 	    ;; structures with no LAYOUT (i.e. :TYPE VECTOR or :TYPE LIST)
 	    ;;
 	    ;; FIXME: should handle the :NAMED T case in these cases
@@ -451,7 +452,7 @@
   (declare (ignore object environment))
   (if slot-names
       (error "stub: MAKE-LOAD-FORM-SAVING-SLOTS :SLOT-NAMES not implemented") ; KLUDGE
-      :just-dump-it-normally))
+      :sb-just-dump-it-normally))
 
 ;;;; testing structure types