fix regressions by adding exception category for labels

Author: FROGGS

src/vm/jvm/QAST/Compiler.nqp

@@ -81,6 +81,7 @@ my $EX_CAT_PROCEED := 256;
 my $EX_CAT_CONTROL := $EX_CAT_NEXT +| $EX_CAT_REDO +| $EX_CAT_LAST +|
                       $EX_CAT_TAKE +| $EX_CAT_WARN +|
                       $EX_CAT_SUCCEED +| $EX_CAT_PROCEED;
+my $EX_CAT_LABELED := 4096;
 
 # Exception handler kinds.
 my $EX_UNWIND_SIMPLE := 0;
@@ -1066,7 +1067,7 @@ for ('', 'repeat_') -> $repness {
             my $l_handler_id;
             my $nr_handler_id;
             if $handler {
-                $l_handler_id  := &*REGISTER_UNWIND_HANDLER($*HANDLER_IDX, $EX_CAT_LAST, :ex_obj(1));
+                $l_handler_id  := &*REGISTER_UNWIND_HANDLER($*HANDLER_IDX, $EX_CAT_LAST,                 :ex_obj(1));
                 $nr_handler_id := &*REGISTER_UNWIND_HANDLER($l_handler_id, $EX_CAT_NEXT +| $EX_CAT_REDO, :ex_obj(1));
             }
 
@@ -1133,6 +1134,8 @@ for ('', 'repeat_') -> $repness {
                 $qastcomp.unwind_check($catch, $nr_handler_id, :$label, :outer($l_handler_id));
                 $catch.append(JAST::Instruction.new( :op('getfield'), $TYPE_EX_UNWIND, 'category', 'Long' ));
                 $catch.append(JAST::PushIVal.new( :value($EX_CAT_REDO) ));
+                $catch.append(JAST::Instruction.new( :op('land') ));
+                $catch.append(JAST::PushIVal.new( :value($EX_CAT_REDO) ));
                 $catch.append($LCMP);
                 $catch.append(JAST::Instruction.new( :op('ifeq'), $redo_lbl ));
                 $body_il := $qastcomp.delimit_handler(
@@ -1712,7 +1715,10 @@ QAST::OperationsJAST.add_core_op('handle', :!inlinable, sub ($qastcomp, $op) {
 my %control_map := nqp::hash(
     'next', $EX_CAT_NEXT,
     'last', $EX_CAT_LAST,
-    'redo', $EX_CAT_REDO
+    'redo', $EX_CAT_REDO,
+    'next_label', $EX_CAT_NEXT +| $EX_CAT_LABELED,
+    'last_label', $EX_CAT_LAST +| $EX_CAT_LABELED,
+    'redo_label', $EX_CAT_REDO +| $EX_CAT_LABELED
 );
 QAST::OperationsJAST.add_core_op('control', -> $qastcomp, $op {
     my $label;
@@ -1721,10 +1727,10 @@ QAST::OperationsJAST.add_core_op('control', -> $qastcomp, $op {
     }
     my $name := $op.name;
     if nqp::existskey(%control_map, $name) {
-        my $cat := %control_map{$name};
         my $il := JAST::InstructionList.new();
         $*STACK.spill_to_locals($il);
         if $label {
+            my $cat := %control_map{$name ~ '_label'};
             my $new_ex := $*TA.fresh_o();
 
             # Create a new exception object
@@ -1758,6 +1764,7 @@ QAST::OperationsJAST.add_core_op('control', -> $qastcomp, $op {
                 '_throw_c', 'Void', $TYPE_SMO, $TYPE_TC )));
         }
         else {
+            my $cat := %control_map{$name};
             $il.append(JAST::PushIVal.new( :value($cat) ));
             $il.append($ALOAD_1);
             $il.append(savesite(JAST::Instruction.new( :op('invokestatic'), $TYPE_OPS,

src/vm/jvm/runtime/org/perl6/nqp/runtime/ExceptionHandling.java

@@ -18,7 +18,7 @@ public class ExceptionHandling {
     public static final int EX_CAT_TAKE = 32;
     public static final int EX_CAT_WARN = 64;
     public static final int EX_CAT_SUCCEED = 128;
-    public static final int EX_CAT_PROCEED = 256;
+    public static final int EX_CAT_LABELED = 4096;
 
     /* Exception handler kinds. */
     public static final int EX_UNWIND_SIMPLE = 0;
@@ -139,7 +139,6 @@ private static void invokeHandler(ThreadContext tc, long[] handlerInfo,
             tc.unwinder.unwindTarget = handlerInfo[0];
             tc.unwinder.unwindCompUnit = handlerFrame.codeRef.staticInfo.compUnit;
             tc.unwinder.category = category;
-            tc.unwinder.result = null;
             throw tc.unwinder;
         case EX_UNWIND_OBJECT:
             tc.unwinder.unwindTarget = handlerInfo[0];

src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java

@@ -4529,9 +4529,12 @@ public static void _throw_c(SixModelObject obj, ThreadContext tc) {
         }
     }
     public static void _is_same_label(UnwindException uwex, long where, long outerHandler, ThreadContext tc) {
+        if ((uwex.category & ExceptionHandling.EX_CAT_LABELED) == 0)
+            return;
+
         if (uwex instanceof UnwindException) {
             VMExceptionInstance vmex = (VMExceptionInstance)uwex.result;
-            if (vmex == null)
+            if (vmex == null || (vmex.category & ExceptionHandling.EX_CAT_LABELED) == 0)
                 return;
 
             if (vmex instanceof VMExceptionInstance) {