X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fslots.lisp;h=786ce4bb58a73677631d6ea8de784910f3aec8ff;hb=4d8378af498b544256340e09919758e1f88029ac;hp=a19070bd352cf556561c751bb2ae45275f673bad;hpb=8aa9f63ab314c44840f6f0b331c5308988521f4a;p=sbcl.git

diff --git a/src/pcl/slots.lisp b/src/pcl/slots.lisp
index a19070b..786ce4b 100644
--- 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)