Changeset 12071

Timestamp:

07/28/09 06:23:20 (14 years ago)

Author:

ehuelsmann

Message:

Retain values across execution of unwinding forms
in unwind protect, in case of errors/non-local returns.

Found by: Alan Ruttenberg.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Primitives.java (modified) (2 diffs)
• compiler-pass2.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Primitives.java

@@ -3712 +3712 @@
           {
             result = eval(args.car(), env, thread);
+          }
+        finally
+          {
             values = thread._values;
-          }
-        finally
-          {
             LispObject body = args.cdr();
             while (body != NIL)
@@ -3722 +3722 @@
                 body = ((Cons)body).cdr;
               }
+            thread._values = values;
           }
         if (values != null)

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

@@ -7829 +7829 @@
       ;; The Throwable object is on the runtime stack. Stack depth is 1.
       (astore exception-register)
+      (emit-push-current-thread)
+      (emit 'getfield +lisp-thread-class+ "_values" +lisp-object-array+)
+      (astore values-register)
       (let ((*register* *register*))
         (dolist (subform cleanup-forms)
           (compile-form subform nil nil)))
       (maybe-emit-clear-values cleanup-forms)
+      (emit-push-current-thread)
+      (aload values-register)
+      (emit 'putfield +lisp-thread-class+ "_values" +lisp-object-array+)
       (aload exception-register)
       (emit 'athrow) ; Re-throw exception.