Run mainlines of modules at BEGIN time

sorear · Nov 1, 2011 · 122ac5d · 122ac5d
1 parent 81deb74
commit 122ac5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/CodeGen.cs b/lib/CodeGen.cs
@@ -4291,9 +4291,13 @@ public class DowncallReceiver : CallReceiver {
                 for (int i = 0; i < s.nam_refs.Length; i++)
                     s.nam_refs[i] = Handle.Unbox(args[i+3]);
                 s.code = RuntimeUnit.JitCompileSub;
+                if (s.protopad != null)
+                    s.protopad.code = s.code;
                 return null;
             } else if (cmd == "save_unit") {
                 RuntimeUnit ru = (RuntimeUnit)Handle.Unbox(args[1]);
+                if (!ru.is_mainish && ru.bottom == null)
+                    ru.RunMainline();
                 ru.Save();
                 return null;
             } else if (cmd == "run_unit") {

diff --git a/lib/Kernel.cs b/lib/Kernel.cs
@@ -786,9 +786,6 @@ public sealed class RuntimeUnit : IFreeze {
 
             Kernel.FirePhasers(this, Kernel.PHASER_UNIT_INIT, false);
             Kernel.FirePhasers(this, Kernel.PHASER_INIT, false);
-
-            if (!is_mainish && bottom == null && filename != "(eval)")
-                RunMainline();
         }
 
         internal void RunMainline() {