0.7.4.7:

[sbcl.git] / src / code / target-defstruct.lisp

diff --git a/src/code/target-defstruct.lisp b/src/code/target-defstruct.lisp
index 4e2061c..858e452 100644 (file)
--- 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
@@ -297,8 +298,7 @@
                               *raw-slot-data-list*)
                     ;; oops
                     (t
-                     (error "internal error: unexpected DSD-RAW-TYPE ~S"
-                            dsd-raw-type))))))
+                     (bug "unexpected DSD-RAW-TYPE ~S" dsd-raw-type))))))
             ;; code shared between DEFSTRUCT :TYPE LIST and
             ;; DEFSTRUCT :TYPE VECTOR cases: Handle the "typed
             ;; structure" case, with no LAYOUTs and no raw slots.
@@ -452,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))
 \f
 ;;;; testing structure types