Changeset 11706

Timestamp:

03/14/09 21:27:26 (14 years ago)

Author:

ehuelsmann

Message:

Protect lastSpecialBinding from unexpected PROGV body termination.
See ticket #52.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp (modified) (3 diffs)

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

@@ -4937 +4937 @@
          (values-form (caddr form))
          (*register* *register*)
-         (environment-register (allocate-register)))
+         (environment-register (allocate-register))
+         (label-START (gensym))
+         (label-END (gensym))
+         (label-EXIT (gensym)))
     (compile-form symbols-form 'stack nil)
     (compile-form values-form 'stack nil)
@@ -4946 +4949 @@
     (emit 'getfield +lisp-thread-class+ "lastSpecialBinding" +lisp-special-binding+)
     (astore environment-register)
+    (label label-START)
     ;; Compile call to Lisp.progvBindVars().
     (aload *thread*)
@@ -4952 +4956 @@
     ;; Implicit PROGN.
     (compile-progn-body (cdddr form) target)
-    ;; Restore dynamic environment.
+    (label label-END)
     (aload *thread*)
     (aload environment-register)
     (emit 'putfield +lisp-thread-class+ "lastSpecialBinding" +lisp-special-binding+)
-    (fix-boxing representation nil)))
+    (emit 'athrow)
+
+    ;; Restore dynamic environment.
+    (label label-EXIT)
+    (aload *thread*)
+    (aload environment-register)
+    (emit 'putfield +lisp-thread-class+ "lastSpecialBinding" +lisp-special-binding+)
+    (fix-boxing representation nil)
+    (push (make-handler :from label-START
+                          :to label-END
+                          :code label-END
+                          :catch-type 0) *handlers*)))
 
 (defun p2-quote (form target representation)