0.8alpha.0.4:

[sbcl.git] / src / pcl / slots.lisp

diff --git a/src/pcl/slots.lisp b/src/pcl/slots.lisp
index a19070b..786ce4b 100644 (file)
--- a/src/pcl/slots.lisp
+++ b/src/pcl/slots.lisp
@@ -58,7 +58,7 @@
         (error "unrecognized instance type"))))
 
 (defun swap-wrappers-and-slots (i1 i2)
-  (sb-sys:without-interrupts
+  (with-pcl-lock                       ;FIXME is this sufficient?
    (cond ((std-instance-p i1)
          (let ((w1 (std-instance-wrapper i1))
                (s1 (std-instance-slots i1)))
@@ -267,7 +267,7 @@
        (error "~@<The slot ~S has neither :INSTANCE nor :CLASS allocation, ~
               so it can't be written by the default ~S method.~@:>"
              slotd 'slot-makunbound-using-class))))
-  nil)
+  object)
 
 (defmethod slot-value-using-class
     ((class structure-class)