Be sure to use line info cache.

rakudo · Feb 27, 2013 · c2910e2 · c2910e2
1 parent b10e2ba
commit c2910e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -1402,7 +1402,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
             }
             if $past.name() eq '$?LINE' {
                 $past := $*W.add_constant('Int', 'int',
-                        HLL::Compiler.lineof($/.orig, $/.from ));
+                        HLL::Compiler.lineof($/.orig, $/.from, :cache(1)));
             }
             else {
                 $past := $*W.add_string_constant(pir::find_caller_lex__Ps('$?FILES') // '<unknown file>');

diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -3326,7 +3326,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
 
         sub push_lines(@target, @pos) {
             for @pos {
-                nqp::push(@target, HLL::Compiler.lineof(self.orig, $_));
+                nqp::push(@target, HLL::Compiler.lineof(self.orig, $_, :cache(1)));
             }
         }
 

diff --git a/src/Perl6/Optimizer.pm b/src/Perl6/Optimizer.pm
@@ -781,7 +781,7 @@ class Perl6::Optimizer {
 
     method add_memo($past_node, $message, @extras?, :$type!) {
         my $mnode := $past_node.node;
-        my $line := HLL::Compiler.lineof($mnode.orig, $mnode.from);
+        my $line := HLL::Compiler.lineof($mnode.orig, $mnode.from, :cache(1));
         my $key := $message ~ (+@extras ?? "\n" ~ nqp::join("\n", @extras) !! "");
         my %cont := $type eq 'deadly' ?? %!deadly !! %!worrying;
         unless %cont{$key} {

diff --git a/src/Perl6/World.pm b/src/Perl6/World.pm
@@ -332,7 +332,7 @@ class Perl6::World is HLL::World {
     # during the deserialization.
     method load_module($/, $module_name, $cur_GLOBALish) {
         # Immediate loading.
-        my $line := HLL::Compiler.lineof($/.orig, $/.from);
+        my $line := HLL::Compiler.lineof($/.orig, $/.from, :cache(1));
         my $module := Perl6::ModuleLoader.load_module($module_name, $cur_GLOBALish, :$line);
 
         # During deserialization, ensure that we get this module loaded.
@@ -2384,7 +2384,7 @@ class Perl6::World is HLL::World {
             }
 
             # Build and throw exception object.
-            %opts<line>            := HLL::Compiler.lineof($c.orig, $c.pos);
+            %opts<line>            := HLL::Compiler.lineof($c.orig, $c.pos, :cache(1));
             %opts<modules>         := p6ize_recursive(@*MODULES);
             %opts<pre>             := @locprepost[0];
             %opts<post>            := @locprepost[1];
@@ -2473,7 +2473,7 @@ class Perl6::World is HLL::World {
             $p6ex.SET_FILE_LINE(
                 nqp::box_s(pir::find_caller_lex__Ps('$?FILES'),
                     self.find_symbol(['Str'])),
-                nqp::box_i(HLL::Compiler.lineof($/.orig, $/.from),
+                nqp::box_i(HLL::Compiler.lineof($/.orig, $/.from, :cache(1)),
                     self.find_symbol(['Int'])),
             );
         }