From: Juho Snellman <jsnell@iki.fi>
Date: Wed, 5 Oct 2005 20:08:41 +0000 (+0000)
Subject: 0.9.5.23:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=aa6ba297065841d20261cbe3cece624465d0edf1;p=sbcl.git

0.9.5.23:
        Add the neccessary *COMPILER-ERROR-CONTEXT* bindings to allow
        Slime compiler note annotation to work on CONSTANT-MODIFIED
        warnings.
---

diff --git a/src/compiler/ir1opt.lisp b/src/compiler/ir1opt.lisp
index 4944949..7e83244 100644
--- a/src/compiler/ir1opt.lisp
+++ b/src/compiler/ir1opt.lisp
@@ -665,11 +665,12 @@
            (when fun
              (let ((destroyed-constant-args (funcall fun args)))
                (when destroyed-constant-args
-                 (warn 'constant-modified
-                       :fun-name (lvar-fun-name
-                                  (basic-combination-fun node)))
-                 (setf (basic-combination-kind node) :error)
-                 (return-from ir1-optimize-combination)))))
+                 (let ((*compiler-error-context* node))
+                   (warn 'constant-modified
+                         :fun-name (lvar-fun-name
+                                    (basic-combination-fun node)))
+                   (setf (basic-combination-kind node) :error)
+                   (return-from ir1-optimize-combination))))))
          (let ((fun (fun-info-derive-type info)))
            (when fun
              (let ((res (funcall fun node)))
@@ -686,11 +687,12 @@
          (when fun
            (let ((destroyed-constant-args (funcall fun args)))
              (when destroyed-constant-args
-               (warn 'constant-modified
-                     :fun-name (lvar-fun-name
-                                (basic-combination-fun node)))
+               (let ((*compiler-error-context* node))
+                 (warn 'constant-modified
+                       :fun-name (lvar-fun-name
+                                  (basic-combination-fun node)))
                  (setf (basic-combination-kind node) :error)
-                 (return-from ir1-optimize-combination)))))
+                 (return-from ir1-optimize-combination))))))
 
        (let ((attr (fun-info-attributes info)))
          (when (and (ir1-attributep attr foldable)
diff --git a/version.lisp-expr b/version.lisp-expr
index d9c79df..c0cf99e 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.5.22"
+"0.9.5.23"