Don't run CallFrame.leave twice when phasers throw - on JVM

Fixes RT #121935
Raku · Mar 4, 2015 · 54d3cf5 · 54d3cf5
1 parent 4602aa5
commit 54d3cf5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/vm/jvm/QAST/Compiler.nqp b/src/vm/jvm/QAST/Compiler.nqp
@@ -3775,9 +3775,6 @@ class QAST::CompilerJAST {
             # rethrown, after calling CallFrame.leave. Others are passed on to
             # dieInternal. Finally, if there's no exception, we also need to
             # call CallFrame.leave.
-            $il.append(JAST::Instruction.new( :op('aload'), 'cf' ));
-            $il.append(JAST::Instruction.new( :op('invokevirtual'),
-                $TYPE_CF, 'leave', 'Void' ));
             my $posthan := JAST::InstructionList.new();
             my $nclab   := JAST::Label.new( :name('non_cont_ex') );
             $posthan.append($DUP);
@@ -3795,6 +3792,9 @@ class QAST::CompilerJAST {
             $posthan.append($ATHROW);
             $*JMETH.append(JAST::TryCatch.new( :try($il), :catch($posthan),
                 :type($TYPE_THROWABLE) ));
+            $*JMETH.append(JAST::Instruction.new( :op('aload'), 'cf' ));
+            $*JMETH.append(JAST::Instruction.new( :op('invokevirtual'),
+                $TYPE_CF, 'leave', 'Void' ));
             $*JMETH.append($RETURN);
 
             if $save_sites {