From b5791569082496e3bc4db6254c870c0bc994e19a Mon Sep 17 00:00:00 2001
From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Wed, 2 Nov 2005 20:50:01 +0000
Subject: [PATCH] 0.9.6.12: 	Implement the UPDATE-DEPENDENT protocol for
 generic functions. 	... after GM cmucl-imp 2005-06-26; 
 ... rudimentary tests.

---
 NEWS                          |    3 +++
 src/pcl/methods.lisp          |   16 +++++++++++---
 tests/mop-8.impure-cload.lisp |   48 +++++++++++++++++++++++++++++++++++++++++
 version.lisp-expr             |    2 +-
 4 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 tests/mop-8.impure-cload.lisp

diff --git a/NEWS b/NEWS
index 10af208..da04493 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ changes in sbcl-0.9.7 relative to sbcl-0.9.6:
   * bug fix: it is now possible to have more than one subclass of
     STANDARD-GENERIC-FUNCTION without causing stack overflow.
     (reported by Bruno Haible, Pascal Costanza and others)
+  * bug fix: the dependent update protocol now works for generic
+    functions.  (thanks to Gerd Moellmann; reported by Bruno Haible
+    and Pascal Costanza)
   * bug fix: *COMPILE-FILE-PATHNAME* now contains the user's pathname
     merged with *DEFAULT-PATHNAME-DEFAULTS*.
   * optimization: performance improvements to IO on file streams of
diff --git a/src/pcl/methods.lisp b/src/pcl/methods.lisp
index 35d6af1..0ac414e 100644
--- a/src/pcl/methods.lisp
+++ b/src/pcl/methods.lisp
@@ -459,7 +459,9 @@
       (when (and (arg-info-valid-p (gf-arg-info gf))
                  (not (null args))
                  (or lambda-list-p (cddr args)))
-        (update-dfun gf)))))
+        (update-dfun gf))
+      (map-dependents gf (lambda (dependent)
+                           (apply #'update-dependent gf dependent args))))))
 
 (declaim (special *lazy-dfun-compute-p*))
 
@@ -548,6 +550,10 @@
                         :generic-function generic-function
                         :method method)
           (update-dfun generic-function))
+        (map-dependents generic-function
+                        (lambda (dep)
+                          (update-dependent generic-function
+                                            dep 'add-method method)))
         generic-function)))
 
 (defun real-remove-method (generic-function method)
@@ -564,8 +570,12 @@
       (update-ctors 'remove-method
                     :generic-function generic-function
                     :method method)
-      (update-dfun generic-function)))
-  generic-function)
+      (update-dfun generic-function)
+      (map-dependents generic-function
+                      (lambda (dep)
+                        (update-dependent generic-function
+                                          dep 'remove-method method)))
+      generic-function)))
 
 (defun compute-applicable-methods-function (generic-function arguments)
   (values (compute-applicable-methods-using-types
diff --git a/tests/mop-8.impure-cload.lisp b/tests/mop-8.impure-cload.lisp
new file mode 100644
index 0000000..e20ace4
--- /dev/null
+++ b/tests/mop-8.impure-cload.lisp
@@ -0,0 +1,48 @@
+;;;; miscellaneous side-effectful tests of the MOP
+
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; While most of SBCL is derived from the CMU CL system, the test
+;;;; files (like this one) were written from scratch after the fork
+;;;; from CMU CL.
+;;;;
+;;;; This software is in the public domain and is provided with
+;;;; absolutely no warranty. See the COPYING and CREDITS files for
+;;;; more information.
+
+;;; This file contains tests of UPDATE-DEPENDENT.
+
+(defpackage "MOP-8"
+  (:use "CL" "SB-MOP" "TEST-UTIL"))
+
+(in-package "MOP-8")
+
+(defclass dependent-history ()
+  ((history :initarg :history :accessor history)))
+
+(defmethod update-dependent ((generic-function generic-function)
+                             (history dependent-history)
+                             &rest args)
+  (push args (history history)))
+(defmethod update-dependent ((class class)
+                             (history dependent-history)
+                             &rest args)
+  (push (cons class args) (history history)))
+
+(defvar *history* (make-instance 'dependent-history :history nil))
+
+(defgeneric upd1 (x))
+(add-dependent #'upd1 *history*)
+(defmethod upd1 ((x integer)) x)
+(let ((last (car (history *history*))))
+  (assert (eq (car last) 'add-method))
+  (assert (typep (cadr last) 'standard-method)))
+
+(defclass foo ()
+  ())
+(add-dependent (find-class 'foo) *history*)
+(defclass foo ()
+  ((a :initarg :a)))
+(let ((last (car (history *history*))))
+  (assert (eq (car last) (find-class 'foo))))
diff --git a/version.lisp-expr b/version.lisp-expr
index 082b84e..6f11c54 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.6.11"
+"0.9.6.12"
-- 
1.7.10.4