pass the label obj around instead of its addr

Raku · May 16, 2014 · 1655e4e · 1655e4e
1 parent b616d6c
commit 1655e4e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 9 deletions.
diff --git a/src/vm/jvm/QAST/Compiler.nqp b/src/vm/jvm/QAST/Compiler.nqp
@@ -4423,11 +4423,21 @@ class QAST::CompilerJAST {
 
         unless $handler_cares {
             $il.append($DUP);
-            $il.append(JAST::PushIVal.new( :value($label ?? nqp::where($label.value) !! 0) ));
-            $il.append(JAST::PushIVal.new( :value($outer) ));
-            $il.append(JAST::Instruction.new( :op('aload'), 'tc' ));
-            $il.append(JAST::Instruction.new( :op('invokestatic'), $TYPE_OPS, '_is_same_label',
-                'Void', $TYPE_EX_UNWIND, 'Long', 'Long', $TYPE_TC ));
+            if $label {
+                my $labjast := self.as_jast($label, :want($RT_OBJ));
+                $il.append($labjast.jast);
+                $*STACK.obtain($il, $labjast);
+                $il.append(JAST::PushIVal.new( :value($outer) ));
+                $il.append(JAST::Instruction.new( :op('aload'), 'tc' ));
+                $il.append(JAST::Instruction.new( :op('invokestatic'), $TYPE_OPS, '_is_same_label',
+                    'Void', $TYPE_EX_UNWIND, $TYPE_SMO, 'Long', $TYPE_TC ));
+            }
+            else {
+                $il.append(JAST::PushIVal.new( :value($outer) ));
+                $il.append(JAST::Instruction.new( :op('aload'), 'tc' ));
+                $il.append(JAST::Instruction.new( :op('invokestatic'), $TYPE_OPS, '_rethrow_label',
+                    'Void', $TYPE_EX_UNWIND, 'Long', $TYPE_TC ));
+            }
         }
     }
 

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/runtime/ExceptionHandling.java b/src/vm/jvm/runtime/org/perl6/nqp/runtime/ExceptionHandling.java
@@ -139,13 +139,16 @@ 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.payload = null;
             throw tc.unwinder;
         case EX_UNWIND_OBJECT:
             tc.unwinder.unwindTarget = handlerInfo[0];
             tc.unwinder.unwindCompUnit = handlerFrame.codeRef.staticInfo.compUnit;
             tc.unwinder.category = category;
             if (exObj != null)
                 tc.unwinder.payload = (SixModelObject)exObj.payload;
+            else
+                tc.unwinder.payload = null;
             throw tc.unwinder;
         case EX_BLOCK:
             try {
@@ -175,6 +178,7 @@ private static void invokeHandler(ThreadContext tc, long[] handlerInfo,
             finally {
                 tc.handlers.remove(tc.handlers.size() - 1);
             }
+            tc.unwinder.category = category;
             tc.unwinder.unwindTarget = handlerInfo[0];
             tc.unwinder.unwindCompUnit = handlerFrame.codeRef.staticInfo.compUnit;
             tc.unwinder.result = Ops.result_o(tc.curFrame);

diff --git a/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java b/src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java
@@ -4528,18 +4528,33 @@ public static void _throw_c(SixModelObject obj, ThreadContext tc) {
             throw ExceptionHandling.dieInternal(tc, "throw needs an object with VMException representation");
         }
     }
-    public static void _is_same_label(UnwindException uwex, long where, long outerHandler, ThreadContext tc) {
+    public static void _is_same_label(UnwindException uwex, SixModelObject where, long outerHandler, ThreadContext tc) {
         if ((uwex.category & ExceptionHandling.EX_CAT_LABELED) == 0)
             return;
 
         if (uwex instanceof UnwindException) {
-            SixModelObject payload = uwex.payload;
-            if (payload.hashCode() == where)
+            if (uwex.payload.hashCode() == where.hashCode())
                 return;
+            VMExceptionInstance vmex = (VMExceptionInstance)newexception(tc);
+            /* We're moving to the outside so we do not rethrow to us. */
+            vmex.category = uwex.category;
+            vmex.payload = uwex.payload;
+            tc.curFrame.curHandler = outerHandler;
+            ExceptionHandling.handlerDynamic(tc, vmex.category, false, vmex);
+        }
+        else {
+            throw ExceptionHandling.dieInternal(tc, "_is_same_label needs an object with UnwindException representation");
+        }
+    }
+    public static void _rethrow_label(UnwindException uwex, long outerHandler, ThreadContext tc) {
+        if ((uwex.category & ExceptionHandling.EX_CAT_LABELED) == 0)
+            return;
+
+        if (uwex instanceof UnwindException) {
             /* We're moving to the outside so we do not rethrow to us. */
             VMExceptionInstance vmex = (VMExceptionInstance)newexception(tc);
             vmex.category = uwex.category;
-            vmex.payload = payload;
+            vmex.payload = uwex.payload;
             tc.curFrame.curHandler = outerHandler;
             ExceptionHandling.handlerDynamic(tc, vmex.category, false, vmex);
         }