X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fboot.lisp;h=fe00080a9ddee94b222b56708c3fd71d961139df;hb=98f3f617894ce24a40764aa98606ce68c5482cf0;hp=c4b2bda3ffafce4ee0280f899c4a239d3c311032;hpb=742e0b2aed0e06a5ac6036c6b576088e3f91208f;p=sbcl.git

diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp
index c4b2bda..fe00080 100644
--- a/src/pcl/boot.lisp
+++ b/src/pcl/boot.lisp
@@ -347,10 +347,8 @@ bootstrapping.
 			 lambda-list
 			 body
 			 env)
-  (let ((*make-instance-function-keys* nil)
-	(*optimize-asv-funcall-p* t)
+  (let ((*optimize-asv-funcall-p* t)
 	(*asv-readers* nil) (*asv-writers* nil) (*asv-boundps* nil))
-    (declare (special *make-instance-function-keys*))
     (multiple-value-bind (method-lambda unspecialized-lambda-list specializers)
 	(add-method-declarations name qualifiers lambda-list body env)
       (multiple-value-bind (method-function-lambda initargs)
@@ -380,9 +378,6 @@ bootstrapping.
 	     ;; intended. I hate that kind of bug (code which silently
 	     ;; gives the wrong answer), so we don't do a DECLAIM
 	     ;; here. -- WHN 20000229
-	     ,@(when *make-instance-function-keys*
-		 `((get-make-instance-functions
-		    ',*make-instance-function-keys*)))
 	     ,@(when (or *asv-readers* *asv-writers* *asv-boundps*)
 		 `((initialize-internal-slot-gfs*
 		    ',*asv-readers* ',*asv-writers* ',*asv-boundps*)))
@@ -937,7 +932,7 @@ bootstrapping.
 	       `(((typep ,emf 'fixnum)
 		  (let ((.new-value. ,(car required-args+rest-arg))
 			(.slots. (get-slots-or-nil
-				  ,(car required-args+rest-arg))))
+				  ,(cadr required-args+rest-arg))))
 		    (when .slots.
 		      (setf (clos-slots-ref .slots. ,emf) .new-value.))))))
 	   ;; (In cmucl-2.4.8 there was a commented-out third ,@(WHEN
@@ -1069,7 +1064,7 @@ bootstrapping.
                             ,call)
                            ,call))))
 		 ,(locally
-		   ;; As above, this declaration supresses code
+		   ;; As above, this declaration suppresses code
 		   ;; deletion notes.
 		   (declare (optimize (inhibit-warnings 3)))
 		   (if (and (null ',rest-arg)