1.0.46.36: par for course, committed the wrong version of MAP-ROOT as 1.0.46.35
This one actually works instead of having package errors.
Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.5220
diff -u -r1.5220 version.lisp-expr
--- version.lisp-expr 15 Mar 2011 14:54:47 -0000 1.5220
+++ version.lisp-expr 15 Mar 2011 15:10:42 -0000
@@ -20,4 +20,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.46.35"
+"1.0.46.36"
Index: contrib/sb-introspect/introspect.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/contrib/sb-introspect/introspect.lisp,v
retrieving revision 1.11
diff -u -r1.11 introspect.lisp
--- contrib/sb-introspect/introspect.lisp 15 Mar 2011 14:54:47 -0000 1.11
+++ contrib/sb-introspect/introspect.lisp 15 Mar 2011 15:10:43 -0000
@@ -900,8 +900,8 @@
(funcall fun part))))
(etypecase object
((or bignum float sb-sys:system-area-pointer fixnum))
- (weak-pointer
- (call (weak-pointer-value object)))
+ (sb-ext:weak-pointer
+ (call (sb-ext:weak-pointer-value object)))
(cons
(call (car object))
(call (cdr object))
@@ -958,11 +958,15 @@
do (call (sb-kernel:%funcallable-instance-info object i))))
(symbol
(when (boundp object)
- (let ((global (ignore-errors (symbol-global-value object)))
- (local (symbol-value object)))
- (call global)
- (unless (eq local global)
- (call local))))
+ (let ((local (symbol-value object)))
+ (handler-case
+ ;; Possibly bound only in the current thread -- and we don't
+ ;; have GLOBAL-BOUNDP.
+ (let ((global (sb-ext:symbol-global-value object)))
+ (unless (eq local global)
+ (call global)))
+ (unbound-variable ()
+ nil))))
(when (and ext (ignore-errors (fboundp object)))
(call (fdefinition object))
(let ((class (find-class object nil)))
@@ -975,7 +979,7 @@
(case (sb-kernel:widetag-of object)
(#.sb-vm::value-cell-header-widetag
(call (sb-kernel::value-cell-ref object)))
- #+sb-lutex
+ #+(and sb-lutex sb-thread)
(#.sb-vm::lutex-widetag)
(t
(warn "~&MAP-ROOT: Unknown widetag ~S: ~S~%"
|