Changeset 11999 for trunk/source/level-1

Timestamp:

May 5, 2009, 1:59:06 PM (12 years ago)

Author:

gb

Message:

In DCODE-FOR-UNIVERSALLY-APPLICABLE-SINGLETON, don't optimize if the
method does CALL-NEXT-METHOD or NEXT-METHOD-P.

File:

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

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

@@ -2499 +2499 @@
 ;;; If there's a single method (with standard method combination) on
 ;;; GF and all of that method's arguments are specialized to the T
-;;; class - and if the method doesn't accept &key - we can just have
-;;; the generic function call the method-function
+;;; class - and if the method doesn't accept &key or do any
+;;; next-method things - we can just have the generic function call
+;;; the method-function
 (defun dcode-for-universally-applicable-singleton (gf)
   (when (eq (generic-function-method-combination gf)
@@ -2509 +2510 @@
                  (null (cdr methods))
                  (null (method-qualifiers method))
-                 (not (logbitp $lfbits-keys-bit (lfun-bits (method-function method))))
+                 (not (logtest (logior (ash 1 $lfbits-keys-bit)
+                                       (ash 1 $lfbits-nextmeth-bit))
+                                 (lfun-bits (method-function method))))
                  (dolist (spec (method-specializers method) t)
                    (unless (eq spec *t-class*)