Changeset 11821

Timestamp:

05/03/09 12:19:19 (14 years ago)

Author:

ehuelsmann

Message:

Be more exact on determining 'being enclosed by a block which
sets (= modifies) the environment'.

File:

• trunk/abcl/src/org/armedbear/lisp/jvm.lisp (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/jvm.lisp

@@ -364 +364 @@
   ;; If non-nil, the TAGBODY contains local blocks which "contaminate" the
   ;; environment, with GO forms in them which target tags in this TAGBODY
+  ;; Non-nil if and only if the block doesn't modify the environment
   needs-environment-restoration
   ;; If non-nil, register containing saved dynamic environment for this block.
@@ -401 +402 @@
 
 
-(defknown enclosed-by-protected-block-p (&optional outermost-block) boolean)
+(defknown enclosed-by-protected-block-p (&optional t) boolean)
 (defun enclosed-by-protected-block-p (&optional outermost-block)
   "Indicates whether the code being compiled/analyzed is enclosed in
@@ -413 +414 @@
       (return-from enclosed-by-protected-block-p t))))
 
-(defknown enclosed-by-environment-setting-block-p (&optional outermost-block)
-  boolean)
+(defknown enclosed-by-environment-setting-block-p (&optional t) boolean)
 (defun enclosed-by-environment-setting-block-p (&optional outermost-block)
   (dolist (enclosing-block *blocks*)
     (when (eq enclosing-block outermost-block)
       (return nil))
-    (when (block-environment-register enclosing-block)
+    (when (and (block-environment-register enclosing-block)
+               (not (block-needs-environment-restoration enclosing-block)))
       (return t))))