Changeset 14483

Timestamp:

04/29/13 08:54:29 (10 years ago)

Author:

rschlatte

Message:

don't use funcallable-standard-instance-access on standard-class objects

File:

• trunk/abcl/src/org/armedbear/lisp/clos.lisp (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -2279 +2279 @@
        (let* ((method (%car methods))
               (class (car (std-method-specializers method)))
-              (slot-name (slot-definition-name (accessor-method-slot-definition method))))
+              (slot-name (slot-definition-name (accessor-method-slot-definition
+                                                method)))
+              (reader (if (typep class 'funcallable-standard-class)
+                          #'funcallable-standard-instance-access
+                          #'standard-instance-access)))
          #'(lambda (arg)
              (declare (optimize speed))
@@ -2293 +2297 @@
                (let ((value (if (consp location)
                                 (cdr location) ; :allocation :class
-                                (funcallable-standard-instance-access arg location))))
+                                (funcall reader arg location))))
                  (if (eq value +slot-unbound+)
                      ;; fix SLOT-UNBOUND.5 from ansi test suite