Changeset 11823 for trunk/abcl/src

Timestamp:

05/03/09 19:01:53 (15 years ago)

Author:

ehuelsmann

Message:

Revert r11814 (fix for stack inconsistencies),
because it breaks in other horrible ways.

File:

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

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

@@ -7872 +7872 @@
            (result-register (allocate-register))
            (values-register (allocate-register))
+           (return-address-register (allocate-register))
            (BEGIN-PROTECTED-RANGE (gensym))
            (END-PROTECTED-RANGE (gensym))
            (HANDLER (gensym))
-           (EXIT (gensym)))
+           (EXIT (gensym))
+           (CLEANUP (gensym)))
       ;; Make sure there are no leftover multiple return values from previous calls.
       (emit-clear-values)
@@ -7887 +7889 @@
           (astore values-register))
         (label END-PROTECTED-RANGE))
-      (dolist (subform cleanup-forms)
-        (compile-form subform nil nil))
+      (emit 'jsr CLEANUP)
       (emit 'goto EXIT) ; Jump over handler.
       (label HANDLER) ; Start of exception handler.
       ;; The Throwable object is on the runtime stack. Stack depth is 1.
       (astore exception-register)
-      (dolist (subform cleanup-forms)
-        (compile-form subform nil nil))
+      (emit 'jsr CLEANUP) ; Call cleanup forms.
       (maybe-emit-clear-values cleanup-forms)
       (aload exception-register)
       (emit 'athrow) ; Re-throw exception.
+      (label CLEANUP) ; Cleanup forms.
+      ;; Return address is on stack here.
+      (astore return-address-register)
+      (dolist (subform cleanup-forms)
+        (compile-form subform nil nil))
+      (emit 'ret return-address-register)
       (label EXIT)
       ;; Restore multiple values returned by protected form.