1.0.43.65: pcl: :DEFINITION-SOURCE / :SOURCE-LOCATION confusion

 Caused source-locations for defgenerics not to be recorded properly.

 Fixes the only issue remaining open from bug 384801.

diff --git a/NEWS b/NEWS
index b38b0a4..24422fb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,8 @@ changes relative to sbcl-1.0.43:
     package-lock violation was detected. (lp#660752)
   * bug fix: the system can store different docstrings for a single function
     under different names. (lp#661631, regression from 1.0.29.24)
+  * bug fix: source-locations of DEFGENERIC forms weren't getting recorded
+    properly. (lp#384801)
 
 changes in sbcl-1.0.43 relative to sbcl-1.0.42:
   * incompatible change: FD-STREAMS no longer participate in the serve-event

diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp
index ecb3bcf..40c6b73 100644 (file)
--- a/src/pcl/boot.lisp
+++ b/src/pcl/boot.lisp
@@ -1722,7 +1722,7 @@ bootstrapping.
 
 (defun ensure-generic-function (fun-name
                                 &rest all-keys
-                                &key environment source-location
+                                &key environment definition-source
                                 &allow-other-keys)
   (declare (ignore environment))
   (let ((existing (and (fboundp fun-name)
@@ -2053,7 +2053,7 @@ bootstrapping.
                                             &key (lambda-list nil
                                                               lambda-list-p)
                                             argument-precedence-order
-                                            source-location
+                                            definition-source
                                             documentation
                                             &allow-other-keys)
   (declare (ignore keys))
@@ -2064,7 +2064,7 @@ bootstrapping.
         ((assoc spec *!generic-function-fixups* :test #'equal)
          (if existing
              (make-early-gf spec lambda-list lambda-list-p existing
-                            argument-precedence-order source-location
+                            argument-precedence-order definition-source
                             documentation)
              (bug "The function ~S is not already defined." spec)))
         (existing
@@ -2073,7 +2073,7 @@ bootstrapping.
         (t
          (pushnew spec *!early-generic-functions* :test #'equal)
          (make-early-gf spec lambda-list lambda-list-p nil
-                        argument-precedence-order source-location
+                        argument-precedence-order definition-source
                         documentation))))
 
 (defun make-early-gf (spec &optional lambda-list lambda-list-p

diff --git a/version.lisp-expr b/version.lisp-expr
index 3134ff5..3bcf62b 100644 (file)
--- 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".)
-"1.0.43.64"
+"1.0.43.65"