Be explicit about what is the mainline.

jnthn · Feb 28, 2013 · f0e8ea9 · f0e8ea9
1 parent f631cb7
commit f0e8ea9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/lib/QAST/JASTCompiler.nqp b/lib/QAST/JASTCompiler.nqp
@@ -2484,6 +2484,12 @@ class QAST::CompilerJAST {
         $hll_meth.append(JAST::Instruction.new( :op('areturn') ));
         $*JCLASS.add_method($hll_meth);
 
+        # Add method that returns the mainline block.
+        my $mainline_meth := JAST::Method.new( :name('mainlineIdx'), :returns('Integer'), :static(0) );
+        $mainline_meth.append(JAST::PushIndex.new( :value($*CODEREFS.cuid_to_idx($cu[0].cuid)) ));
+        $mainline_meth.append(JAST::Instruction.new( :op('ireturn') ));
+        $*JCLASS.add_method($mainline_meth);
+
         return $*JCLASS;
     }
 

diff --git a/src/org/perl6/nqp/runtime/CompilationUnit.java b/src/org/perl6/nqp/runtime/CompilationUnit.java
@@ -171,4 +171,11 @@ public int deserializeIdx() {
     public int loadIdx() {
     	return -1;
     }
+
+    /**
+     * Code generation overrides this with the mainline blcok.
+     */
+    public int mainlineIdx() {
+    	return -1;
+    }
 }
diff --git a/src/org/perl6/nqp/runtime/Ops.java b/src/org/perl6/nqp/runtime/Ops.java
@@ -3186,7 +3186,7 @@ public static long iscompunit(SixModelObject obj, ThreadContext tc) {
     }
     public static SixModelObject compunitmainline(SixModelObject obj, ThreadContext tc) {
     	EvalResult res = (EvalResult)obj;
-    	return res.cu.codeRefs[0];
+    	return res.cu.codeRefs[res.cu.mainlineIdx()];
     }
     public static SixModelObject compunitcodes(SixModelObject obj, ThreadContext tc) {
     	EvalResult res = (EvalResult)obj;