From: Alexey Dejneka <adejneka@comail.ru>
Date: Tue, 14 Sep 2004 03:38:14 +0000 (+0000)
Subject: 0.8.4.19:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=4d5d7a4d8451095eac7384e3a8d14d10f59c5e0c;p=sbcl.git

0.8.4.19:
        * Quick fix: disable insertion of stepping forms in
          FILTER-LVAR. (The proper way would be to rename
          *ALLOW-DEBUG-CATCH-TAG* to *ALLOW-CODE-INSTRUMENTATION* and
          use it to disable insertion of stepping forms into
          internally generated code, but first I'd like to restore
          SLIME compilability.)
---

diff --git a/src/compiler/ir1util.lisp b/src/compiler/ir1util.lisp
index 4e4b031..1914d04 100644
--- a/src/compiler/ir1util.lisp
+++ b/src/compiler/ir1util.lisp
@@ -276,7 +276,8 @@
         (dolist (block (block-pred old-block))
           (change-block-successor block old-block new-block))
 
-        (ir1-convert new-start ctran filtered-lvar form)
+        (ir1-convert new-start ctran filtered-lvar
+                     `(locally (declare (optimize (insert-step-conditions 0))) ,form))
 
         ;; KLUDGE: Comments at the head of this function in CMU CL
         ;; said that somewhere in here we
diff --git a/tests/compiler.pure.lisp b/tests/compiler.pure.lisp
index cadd0b0..1b48367 100644
--- a/tests/compiler.pure.lisp
+++ b/tests/compiler.pure.lisp
@@ -1440,3 +1440,23 @@
 			                (type (unsigned-byte 32) x y))
 			       (logand #xffffffff (ash x y))))
 		1 257)))
+
+;;; code instrumenting problems
+(compile nil
+  '(lambda ()
+    (declare (optimize (debug 3)))
+    (list (the integer (if nil 14 t)))))
+
+(compile nil
+  '(LAMBDA (A B C D)
+    (DECLARE (NOTINLINE LOGORC1 BYTE MASK-FIELD))
+    (DECLARE
+     (OPTIMIZE (SPEED 1)
+      (SPACE 1)
+      (SAFETY 1)
+      (DEBUG 3)
+      (COMPILATION-SPEED 0)))
+    (MASK-FIELD (BYTE 7 26)
+     (PROGN
+       (TAGBODY (THE INTEGER (CATCH 'CT4 (LOGORC1 C -15950))) 1)
+       B))))
diff --git a/version.lisp-expr b/version.lisp-expr
index 7746172..4896f88 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.14.18"
+"0.8.14.19"