X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fvector.lisp;h=995fa6ffdb3f86d1191362363f35134e33b2468c;hb=ff92598854bf7cae8d57fe49cef4d9a98e1ab345;hp=02bbe2862d79366969e25ebd111ca688dcf33dfb;hpb=ea4b766a763ce8a2978b937e665a3eb8fd7e5bcb;p=sbcl.git

diff --git a/src/pcl/vector.lisp b/src/pcl/vector.lisp
index 02bbe28..995fa6f 100644
--- a/src/pcl/vector.lisp
+++ b/src/pcl/vector.lisp
@@ -907,7 +907,8 @@
   `(pv-env (,pv ,calls ,pv-table-symbol ,pv-parameters)
      (let (,@(mapcar (lambda (slot-var p) `(,slot-var (get-slots-or-nil ,p)))
 		     slot-vars pv-parameters))
-	,@body)))
+       (declare (ignorable ,@(mapcar #'identity slot-vars)))
+       ,@body)))
 
 ;;; This gets used only when the default MAKE-METHOD-LAMBDA is
 ;;; overridden.
@@ -1090,27 +1091,30 @@
       `(list*
 	:fast-function
 	(,(if (body-method-name body) 'named-lambda 'lambda)
-	 ,@(when (body-method-name body)
-	     (list (body-method-name body))) ; function name
-	 (.pv-cell. .next-method-call. ,@args+rest-arg) ; function args
-	 ;; body of the function
-	 (declare (ignorable .pv-cell. .next-method-call.))
-	 ,@outer-decls
-	 (macrolet ((pv-env ((pv calls pv-table-symbol pv-parameters)
-			     &rest forms)
-			    (declare (ignore pv-table-symbol
-					     pv-parameters))
-			    `(let ((,pv (car .pv-cell.))
-				   (,calls (cdr .pv-cell.)))
-			       (declare ,(make-pv-type-declaration pv)
-					,(make-calls-type-declaration calls))
-			       ,pv ,calls
-			       ,@forms)))
-	   (fast-lexical-method-functions
-	    (,(car lmf-params) .next-method-call. ,req-args ,rest-arg
-	     ,@(cdddr lmf-params))
-	    ,@inner-decls
-	    ,@body-sans-decls)))
+	  ,@(when (body-method-name body)
+		  (list (body-method-name body))) ; function name
+	  (.pv-cell. .next-method-call. ,@args+rest-arg) ; function args
+	  ;; body of the function
+	  (declare (ignorable .pv-cell. .next-method-call.))
+	  ,@outer-decls
+	  (declare (disable-package-locks pv-env))
+	   (macrolet ((pv-env ((pv calls pv-table-symbol pv-parameters)
+			       &rest forms)
+			(declare (ignore pv-table-symbol
+					 pv-parameters))
+			(declare (enable-package-locks pv-env))
+			`(let ((,pv (car .pv-cell.))
+			       (,calls (cdr .pv-cell.)))
+			   (declare ,(make-pv-type-declaration pv)
+				    ,(make-calls-type-declaration calls))
+			   ,pv ,calls
+			   ,@forms)))
+	     (declare (enable-package-locks pv-env))
+	     (fast-lexical-method-functions
+	      (,(car lmf-params) .next-method-call. ,req-args ,rest-arg
+		,@(cdddr lmf-params))
+	      ,@inner-decls
+	      ,@body-sans-decls)))
 	',initargs))))
 
 ;;; Use arrays and hash tables and the fngen stuff to make this much
@@ -1149,7 +1153,7 @@
 			(setf (get (car fname) 'method-sym)
 			      (let ((str (symbol-name (car fname))))
 				(if (string= "FAST-" str :end2 5)
-				    (intern (subseq str 5) *pcl-package*)
+				    (format-symbol *pcl-package* (subseq str 5))
 				    (car fname)))))
 		    ,@(cdr fname))))
       (set-fun-name method-function name))