Changeset 11827

Timestamp:

05/03/09 21:00:28 (14 years ago)

Author:

ehuelsmann

Message:

P2-CATCH: Do what we do in P1-CATCH, which is binding
the CATCH block during compilation of the body.

File:

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

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

@@ -7793 +7793 @@
       (emit-invokevirtual +lisp-thread-class+ "pushCatchTag"
                           (lisp-object-arg-types 1) nil)
-      ; Stack depth is 0.
-      (label BEGIN-PROTECTED-RANGE) ; Start of protected range.
-      (compile-progn-body (cddr form) target) ; Implicit PROGN.
-      (label END-PROTECTED-RANGE) ; End of protected range.
-      (emit 'goto EXIT) ; Jump over handlers.
+      (let ((*blocks* (cons block *blocks*)))
+        ; Stack depth is 0.
+        (label BEGIN-PROTECTED-RANGE) ; Start of protected range.
+        (compile-progn-body (cddr form) target) ; Implicit PROGN.
+        (label END-PROTECTED-RANGE) ; End of protected range.
+        (emit 'goto EXIT)) ; Jump over handlers.
       (label THROW-HANDLER) ; Start of handler for THROW.
       ;; The Throw object is on the runtime stack. Stack depth is 1.