Move CallFrame creation inside invokee.

This gets invokeInternal down to doing nothing once it settles on a method handle to invoke; everything else is inside the method.
jnthn · Mar 2, 2013 · 1359b26 · 1359b26
1 parent d0c8319
commit 1359b26
Show file tree

Hide file tree

Showing 3 changed files with 261 additions and 200 deletions.
diff --git a/lib/QAST/JASTCompiler.nqp b/lib/QAST/JASTCompiler.nqp
@@ -2650,8 +2650,12 @@ class QAST::CompilerJAST {
             # Emit prelude. This populates the cf (callframe) field as well as having
             # locals for the argument buffers for easy/fast access later on.
             $*JMETH.add_local('cf', $TYPE_CF);
+            $*JMETH.append(JAST::Instruction.new( :op('new'), $TYPE_CF ));
+            $*JMETH.append(JAST::Instruction.new( :op('dup') ));
             $*JMETH.append(JAST::Instruction.new( :op('aload_1') ));
-            $*JMETH.append(JAST::Instruction.new( :op('getfield'), $TYPE_TC, 'curFrame', $TYPE_CF ));
+            $*JMETH.append(JAST::Instruction.new( :op('aload'), 'cr' ));
+            $*JMETH.append(JAST::Instruction.new( :op('invokespecial'), $TYPE_CF, '<init>',
+                'Void', $TYPE_TC, $TYPE_CR ));
             if $*MAX_ARGS_O {
                 $*JMETH.add_local('oArgs', "[$TYPE_SMO");
                 $*JMETH.append(JAST::Instruction.new( :op('dup') ));

diff --git a/src/org/perl6/nqp/runtime/Ops.java b/src/org/perl6/nqp/runtime/Ops.java
@@ -1260,9 +1260,6 @@ private static void invokeInternal(ThreadContext tc, SixModelObject invokee, Cal
     			cr = (CodeRef)is.InvocationHandler;
     	}
 
-        // Create a new call frame.
-        CallFrame cf = new CallFrame(tc, cr);
-
         try {
         	// Do the invocation.
         	cr.staticInfo.mh.invokeExact(tc, cr, csd);