From: Alastair Bridgewater <lisphacker@users.sourceforge.net>
Date: Wed, 30 Dec 2009 22:53:37 +0000 (+0000)
Subject: 1.0.34.1: Kludge reduction in debug-int.
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=542c7e4216c4179d0527dd5ffec3162bdc273622;p=sbcl.git

1.0.34.1: Kludge reduction in debug-int.

  * We can't dump packages in the cross-compiler, but we can use
load-time-value, which is sufficient.
---

diff --git a/src/code/debug-int.lisp b/src/code/debug-int.lisp
index d02edae..a795e72 100644
--- a/src/code/debug-int.lisp
+++ b/src/code/debug-int.lisp
@@ -1604,22 +1604,13 @@ register."
       (without-package-locks
         (setf (compiled-debug-var-symbol (svref vars i))
               (intern (format nil "ARG-~V,'0D" width i)
-                      ;; KLUDGE: It's somewhat nasty to have a bare
-                      ;; package name string here. It would be
-                      ;; nicer to have #.(FIND-PACKAGE "SB!DEBUG")
-                      ;; instead, since then at least it would transform
-                      ;; correctly under package renaming and stuff.
-                      ;; However, genesis can't handle dumped packages..
-                      ;; -- WHN 20000129
-                      ;;
-                      ;; FIXME: Maybe this could be fixed by moving the
-                      ;; whole debug-int.lisp file to warm init? (after
-                      ;; which dumping a #.(FIND-PACKAGE ..) expression
-                      ;; would work fine) If this is possible, it would
-                      ;; probably be a good thing, since minimizing the
-                      ;; amount of stuff in cold init is basically good.
-                      (or (find-package "SB-DEBUG")
-                          (find-package "SB!DEBUG"))))))))
+                      ;; The cross-compiler won't dump literal package
+                      ;; references because the target package objects
+                      ;; aren't created until partway through
+                      ;; cold-init. In lieu of adding smarts to the
+                      ;; build framework to handle this, we use an
+                      ;; explicit load-time-value form.
+                      (load-time-value (find-package "SB!DEBUG"))))))))
 
 ;;; Parse the packed representation of DEBUG-VARs from
 ;;; DEBUG-FUN's SB!C::COMPILED-DEBUG-FUN, returning a vector
diff --git a/version.lisp-expr b/version.lisp-expr
index a82349d..ec1203b 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".)
-"1.0.34"
+"1.0.34.1"