Use a shared preallocated null capture

sorear · Oct 4, 2010 · 7aef582 · 7aef582
1 parent 680f033
commit 7aef582
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/lib/Kernel.cs b/lib/Kernel.cs
@@ -95,6 +95,8 @@ public abstract class Variable : IP6 {
 
         public abstract IP6  GetVar();
 
+        public static readonly Variable[] None = new Variable[0];
+
         public override DynMetaObject GetMO() { return null; }
     }
 
@@ -939,7 +941,7 @@ public static Frame StartP6Thread(Frame th, IP6 sub) {
             th.MarkSharedChain();
             Thread thr = new Thread(delegate () {
                     Frame mark = new Frame(th, null, ExitRunloopSI);
-                    Frame cur = sub.Invoke(mark, new Variable[0], null);
+                    Frame cur = sub.Invoke(mark, Variable.None, null);
                     RunCore(cur);
                 });
             thr.Start();

diff --git a/perf/callmark.pl b/perf/callmark.pl
@@ -29,4 +29,4 @@
 sub x29 () { x28; x28 } # 536870911
 sub x30 () { x29; x29 } # 1073741823
 
-x27;
+x30;
diff --git a/src/CLRTypes.pm b/src/CLRTypes.pm
@@ -105,6 +105,7 @@ my %typedata = (
 
     'Lexer.RunProtoregex'  => [m => 'IP6[]'],
     'Lexer.GetLexer'       => [m => 'Lexer'],
+    'Variable.None'        => [f => 'Variable[]'],
     'Kernel.SearchForHandler' => [c => 'Variable'],
     'Kernel.Die'           => [c => 'Variable'],
     'Kernel.BindFail'      => [c => 'Variable'],

diff --git a/src/CodeGen.pm b/src/CodeGen.pm
@@ -242,7 +242,9 @@ use CLRTypes;
         my $quick = 1;
         for (@$sig) { $quick &&= ($_ eq '') }
         my ($inv, @vals) = _odds(@args);
-        if ($quick) {
+        if (!@vals) {
+            return $inv, "Variable.None", "null";
+        } elsif ($quick) {
             return $inv, "new Variable[] { " . join(", ", @vals) . "}", "null";
         } else {
             # TODO: optimize harder
@@ -299,11 +301,17 @@ use CLRTypes;
 
     sub clr_new_arr {
         my ($self, $class, @args) = @_;
+        if ($class eq 'Variable' && !@args) {
+            return "Variable[]", "Variable.None";
+        }
         $class . "[]", "new $class []{" .  join(", ", _odds @args) . "}";
     }
 
     sub clr_new_zarr {
         my ($self, $class, $nity, $nitems) = @_;
+        if ($class eq 'Variable' && $nitems eq "0") {
+            return "Variable[]", "Variable.None";
+        }
         $class . "[]", "(new $class [$nitems])";
     }