Changeset 11399

Timestamp:

Nov 18, 2008, 8:58:16 PM (12 years ago)

Author:

gz

Message:

Don't do make-instance optimization if there are any specialized initialize-instance methods

File:

• trunk/source/level-1/l1-clos.lisp (modified) (2 diffs)

trunk/source/level-1/l1-clos.lisp

@@ -2164 +2164 @@
 ;;; Return a list of :after methods for INITIALIZE-INSTANCE on the
 ;;; class's prototype, and a boolean that's true if no other qualified
-;;; methods are defined.
+;;; methods are defined and at most one primary one.
 (defun initialize-instance-after-methods (proto class)
   (let* ((method-list (compute-method-list (sort-methods
@@ -2171 +2171 @@
     (if (atom method-list)
       (values nil t)
-      (if (null (car method-list))
+      (if (and (null (car method-list))
+               (null (cdddr method-list)))
         (values (cadr method-list) t)
-        ;; :around or :before methods, give up
+        ;; :around or :before methods, or more than one primary method, give up
         (values nil nil)))))