0.pre7.55:

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

diff --git a/src/pcl/dfun.lisp b/src/pcl/dfun.lisp
index 8a44336..003f6d3 100644 (file)
--- a/src/pcl/dfun.lisp
+++ b/src/pcl/dfun.lisp
@@ -963,23 +963,19 @@ And so, we are saved.
 ;;;           an :instance slot, this is the index number of that slot
 ;;;           in the object argument.
 (defun cache-miss-values (gf args state)
-  (if (null (if (early-gf-p gf)
-               (early-gf-methods gf)
-               (generic-function-methods gf)))
-      (apply #'no-applicable-method gf args)
-      (multiple-value-bind (nreq applyp metatypes nkeys arg-info)
-         (get-generic-function-info gf)
-       (declare (ignore nreq applyp nkeys))
-       (with-dfun-wrappers (args metatypes)
-         (dfun-wrappers invalid-wrapper-p wrappers classes types)
-         (error-need-at-least-n-args gf (length metatypes))
-         (multiple-value-bind (emf methods accessor-type index)
-             (cache-miss-values-internal
-              gf arg-info wrappers classes types state)
-           (values emf methods
-                   dfun-wrappers
-                   invalid-wrapper-p
-                   accessor-type index))))))
+  (multiple-value-bind (nreq applyp metatypes nkeys arg-info)
+      (get-generic-function-info gf)
+    (declare (ignore nreq applyp nkeys))
+    (with-dfun-wrappers (args metatypes)
+      (dfun-wrappers invalid-wrapper-p wrappers classes types)
+      (error-need-at-least-n-args gf (length metatypes))
+      (multiple-value-bind (emf methods accessor-type index)
+          (cache-miss-values-internal
+           gf arg-info wrappers classes types state)
+        (values emf methods
+                dfun-wrappers
+                invalid-wrapper-p
+                accessor-type index)))))
 
 (defun cache-miss-values-internal (gf arg-info wrappers classes types state)
   (let* ((for-accessor-p (eq state 'accessor))
@@ -1509,7 +1505,7 @@ And so, we are saved.
     (let ((dfun (if early-p
                    (or dfun (make-initial-dfun generic-function))
                    (compute-discriminating-function generic-function))))
-      (set-funcallable-instance-function generic-function dfun)
+      (set-funcallable-instance-fun generic-function dfun)
       (set-function-name generic-function gf-name)
       (when (and ocache (not (eq ocache cache))) (free-cache ocache))
       dfun)))