From 0d1030c5fea1986c6383b6be531f95da7ae20644 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Tue, 29 Jun 2004 12:13:44 +0000 Subject: [PATCH] 0.8.12.9: Indentation change to debug-dump.lisp ... resulting from complete failure to find where source info is conditionally dumped on (debug 2). Also log the (SETF VALUES) bug --- BUGS | 10 ++++++++++ src/compiler/debug-dump.lisp | 9 +++++---- version.lisp-expr | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/BUGS b/BUGS index 0963925..66d06c9 100644 --- a/BUGS +++ b/BUGS @@ -1591,3 +1591,13 @@ WORKAROUND: should signal an invalid-method-error, as the :IGNORE (NUMBER) method is applicable, and yet matches neither of the method group qualifier patterns. + +340: SETF of VALUES using too many values + (reported by Kalle Olavi Niemetalo via the Debian bug system, with + bug id #256764) + + (let ((a t) (b t) (c t) (d t)) + (setf (values (values a b) (values c d)) (values 1 2 3 4)) + (list a b c d)) + should return (1 NIL 2 NIL), but under sbcl-0.8.12.x returns + (1 2 3 4) instead. diff --git a/src/compiler/debug-dump.lisp b/src/compiler/debug-dump.lisp index 70b9c18..9e3630a 100644 --- a/src/compiler/debug-dump.lisp +++ b/src/compiler/debug-dump.lisp @@ -533,10 +533,11 @@ (compute-args fun var-locs)))) (if (>= level 2) - (multiple-value-bind (blocks tlf-num) (compute-debug-blocks fun var-locs) - (setf (compiled-debug-fun-tlf-number dfun) tlf-num) - (setf (compiled-debug-fun-blocks dfun) blocks)) - (setf (compiled-debug-fun-tlf-number dfun) (find-tlf-number fun))) + (multiple-value-bind (blocks tlf-num) + (compute-debug-blocks fun var-locs) + (setf (compiled-debug-fun-tlf-number dfun) tlf-num) + (setf (compiled-debug-fun-blocks dfun) blocks)) + (setf (compiled-debug-fun-tlf-number dfun) (find-tlf-number fun))) (if (xep-p fun) (setf (compiled-debug-fun-returns dfun) :standard) diff --git a/version.lisp-expr b/version.lisp-expr index 92cf408..a7bb022 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.8.12.8" +"0.8.12.9" -- 1.7.10.4