Further gutting of invokeInternal.

jnthn · Mar 2, 2013 · ccb441b · ccb441b
1 parent 22ac999
commit ccb441b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/org/perl6/nqp/runtime/CallFrame.java b/src/org/perl6/nqp/runtime/CallFrame.java
@@ -147,5 +147,14 @@ public CallFrame(ThreadContext tc, CodeRef cr) {
             this.nArg = new double[sci.nMaxArgs];
         if (sci.sMaxArgs > 0)
             this.sArg = new String[sci.sMaxArgs];
+
+        // Current call frame becomes this new one.
+        tc.curFrame = this;
+    }
+
+    // Does work needed to leave this callframe.
+    public void leave() {
+    	this.codeRef.staticInfo.priorInvocation = this;
+    	this.tc.curFrame = this.caller;
     }
 }
diff --git a/src/org/perl6/nqp/runtime/Ops.java b/src/org/perl6/nqp/runtime/Ops.java
@@ -1282,9 +1282,6 @@ private static void invokeInternal(ThreadContext tc, SixModelObject invokee, Cal
         CallFrame cf = new CallFrame(tc, cr);
         cf.callSite = csd;
 
-        // Current call frame becomes this new one.
-        tc.curFrame = cf;
-
         try {
         	// Do the invocation.
         	cr.staticInfo.mh.invokeExact(tc);
@@ -1299,9 +1296,7 @@ private static void invokeInternal(ThreadContext tc, SixModelObject invokee, Cal
 			ExceptionHandling.dieInternal(tc, e.getMessage());
 		}
         finally {
-        	// Set curFrame back to caller.
-        	cr.staticInfo.priorInvocation = cf;
-        	tc.curFrame = cf.caller;
+        	cf.leave();
         }
     }
     public static SixModelObject invokewithcapture(SixModelObject invokee, SixModelObject capture, ThreadContext tc) throws Exception {