0.8.21.50:

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

diff --git a/src/pcl/vector.lisp b/src/pcl/vector.lisp
index f75acf6..231ca8d 100644 (file)
--- a/src/pcl/vector.lisp
+++ b/src/pcl/vector.lisp
@@ -958,7 +958,7 @@
     simple-bit-vector simple-string simple-vector single-float standard-char
     stream string symbol t unsigned-byte vector))
 
-(defun split-declarations (body args calls-next-method-p)
+(defun split-declarations (body args maybe-reads-params-p)
   (let ((inner-decls nil)
        (outer-decls nil)
        decl)
@@ -1011,7 +1011,7 @@
                               ;; involved, to prevent compiler
                               ;; warnings about ignored args being
                               ;; read.
-                              (unless (and calls-next-method-p
+                              (unless (and maybe-reads-params-p
                                            (eq (car dname) 'ignore))
                                 (push var outers))
                               (push var inners)))
@@ -1044,7 +1044,7 @@
 (defun name-method-lambda (method-lambda)
   (let ((method-name (body-method-name (cddr method-lambda))))
     (if method-name
-       `(named-lambda ,method-name ,(rest method-lambda))
+       `(named-lambda (slow-method ,method-name) ,(rest method-lambda))
        method-lambda)))
 
 (defun make-method-initargs-form-internal (method-lambda initargs env)
@@ -1083,7 +1083,8 @@
     (initargs body req-args lmf-params restp)
   (multiple-value-bind (outer-decls inner-decls body-sans-decls)
       (split-declarations
-       body req-args (getf (cdr lmf-params) :call-next-method-p))
+       body req-args (or (getf (cdr lmf-params) :call-next-method-p)
+                        (getf (cdr lmf-params) :setq-p)))
     (let* ((rest-arg (when restp '.rest-arg.))
           (args+rest-arg (if restp
                              (append req-args (list rest-arg))
@@ -1091,27 +1092,31 @@
       `(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)
+                  ;; function name
+                 (list (cons 'fast-method (body-method-name body))))
+         (.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
@@ -1146,13 +1151,7 @@
                    (apply fmf pv-cell nmc (nconc args (list rest))))
                  (apply fmf pv-cell nmc method-args)))))
     (let* ((fname (method-function-get fmf :name))
-          (name `(,(or (get (car fname) 'method-sym)
-                       (setf (get (car fname) 'method-sym)
-                             (let ((str (symbol-name (car fname))))
-                               (if (string= "FAST-" str :end2 5)
-                                   (intern (subseq str 5) *pcl-package*)
-                                   (car fname)))))
-                   ,@(cdr fname))))
+          (name (cons 'slow-method (cdr fname))))
       (set-fun-name method-function name))
     (setf (method-function-get method-function :fast-function) fmf)
     method-function))