[armedbear-cvs] r12995 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Thu Nov  4 06:09:16 2010
New Revision: 12995

Log:
Fix JRockit crashing on our byte code.

Found by: Joel Borggrén-Franck
          joel (dot) borggren (dot) franck <at> gmail.com
Patch by: me

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

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Thu Nov  4 06:09:16 2010
@@ -3601,6 +3601,10 @@
         (emit-push-variable (block-id-variable block))
         ;; If it's not the block we're looking for...
         (emit 'if_acmpeq THIS-BLOCK) ; Stack depth is 1.
+        ;; Not the tag we're looking for.
+        (emit 'aconst_null) ;; load null value
+        (emit-move-to-variable (block-id-variable block))
+        (emit 'athrow)
         (label EXTENT-EXIT-HANDLER)
         ;; Not the tag we're looking for.
         (emit 'aconst_null) ;; load null value