From ef5bc526202b95f6a1bf92fe88d2fa778a827190 Mon Sep 17 00:00:00 2001 From: Juho Snellman Date: Sun, 16 Jul 2006 21:56:37 +0000 Subject: [PATCH] 0.9.14.20: Oops. After some recent changes, SBCL couldn't be built with 0.9.13 or 0.9.14 as the host. Add a workaround to allow using them too (the actual bug was fixed in 0.9.14.19). --- src/code/class.lisp | 7 +++++-- version.lisp-expr | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/code/class.lisp b/src/code/class.lisp index c0d7ed0..eb35177 100644 --- a/src/code/class.lisp +++ b/src/code/class.lisp @@ -1474,8 +1474,11 @@ NIL is returned when no such class exists." (dolist (code codes) (setf (svref res code) layout))))))) (setq *null-classoid-layout* - (locally - (declare (notinline find-classoid)) + ;; KLUDGE: we use (LET () ...) instead of a LOCALLY here to + ;; work around a bug in the LOCALLY handling in the fopcompiler + ;; (present in 0.9.13-0.9.14.18). -- JES, 2006-07-16 + (let () + (declare (notinline find-classoid)) (classoid-layout (find-classoid 'null)))) #-sb-xc-host (/show0 "done setting *BUILT-IN-CLASS-CODES*")) diff --git a/version.lisp-expr b/version.lisp-expr index bd3f593..4e884d1 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.14.19" +"0.9.14.20" -- 1.7.10.4