Changeset 11820 for trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp

Timestamp:

05/03/09 10:10:21 (14 years ago)

Author:

ehuelsmann

Message:

Make local GO restore the environment of the TAGBODY,
in case it jumps out of blocks setting the environment.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp

@@ -361 +361 @@
       (cond ((eq (tag-compiland tag) *current-compiland*)
              ;; Does the GO leave an enclosing UNWIND-PROTECT?
-             (when (enclosed-by-protected-block-p tag-block)
-               (setf (block-non-local-go-p tag-block) t)))
+             (if (enclosed-by-protected-block-p tag-block)
+                 (setf (block-non-local-go-p tag-block) t)
+                 ;; non-local GO's ensure environment restoration
+                 ;; find out about this local GO
+                 (when (null (block-needs-environment-restoration tag-block))
+                   (setf (block-needs-environment-restoration tag-block)
+                         (enclosed-by-environment-setting-block-p tag-block)))))
             (t
              (setf (block-non-local-go-p tag-block) t)))))