Changeset 12996

Timestamp:

11/04/10 13:41:38 (12 years ago)

Author:

ehuelsmann

Message:

Fix JRockit crashing on our byte code - second occurrance.

Found by: Joel Borggrén-Franck

joel (dot) borggren (dot) franck <at> gmail.com

Patch by: me

File:

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

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

@@ -6448 +6448 @@
            (END-PROTECTED-RANGE (gensym))
            (THROW-HANDLER (gensym))
+           (RETHROW (gensym))
            (DEFAULT-HANDLER (gensym))
            (EXIT (gensym)))
@@ -6474 +6475 @@
       (emit-move-from-stack target) ; Stack depth is 0.
       (emit 'goto EXIT)
+      (label RETHROW) ; Start of handler for all other Throwables.
+      ;; A Throwable object is on the runtime stack here. Stack depth is 1.
+      (emit-push-current-thread)
+      (emit-invokevirtual +lisp-thread+ "popCatchTag" nil nil)
+      (emit 'athrow) ; Re-throw.
       (label DEFAULT-HANDLER) ; Start of handler for all other Throwables.
       ;; A Throwable object is on the runtime stack here. Stack depth is 1.