Remove unnecessary caching on .elems

Only a Seq needs caching of .elems nowadays, and it does so internally. Makes @A[*-1] another 10% or so faster and probably has speed advantages in other situations as well.
rakudo · Dec 19, 2016 · ab26b58 · ab26b58
1 parent b39c0d8
commit ab26b58
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/src/core/Block.pm b/src/core/Block.pm
@@ -330,8 +330,8 @@ my class Block { # declared in BOOTSTRAP
           (my $n := nqp::getattr(
             nqp::getattr($self,Code,'$!signature'),Signature,'$!count')
           ),Num) && nqp::isnanorinf($n)) || nqp::iseq_i(nqp::unbox_i($n),1),
-        $self(nqp::if(nqp::isconcrete(list),list.cache.elems,0)),
-        $self(|(nqp::if(nqp::isconcrete(list),list.cache.elems,0) xx $n))
+        $self(nqp::if(nqp::isconcrete(list),list.elems,0)),
+        $self(|(nqp::if(nqp::isconcrete(list),list.elems,0) xx $n))
       )
     }
 }

diff --git a/src/core/Buf.pm b/src/core/Buf.pm
@@ -612,7 +612,7 @@ multi sub pack(@template, *@items) {
                 my $data = shift @items // Buf.new;
                 $data.=encode if nqp::istype($data,Str);
                 if $amount eq '*' {
-                    $amount = $data.cache.elems;
+                    $amount = $data.elems;
                 }
                 if $amount eq '' {
                     $amount = 1;

diff --git a/src/core/WhateverCode.pm b/src/core/WhateverCode.pm
@@ -9,8 +9,8 @@ my class WhateverCode is Code {
             Signature,
             '$!count'
           ),1),
-        $self(nqp::if(nqp::isconcrete(list),list.cache.elems,0)),
-        $self(|(nqp::if(nqp::isconcrete(list),list.cache.elems,0)
+        $self(nqp::if(nqp::isconcrete(list),list.elems,0)),
+        $self(|(nqp::if(nqp::isconcrete(list),list.elems,0)
           xx nqp::getattr(
             nqp::getattr($self,Code,'$!signature'),
             Signature,

diff --git a/src/core/array_slice.pm b/src/core/array_slice.pm
@@ -17,7 +17,7 @@ multi sub POSITIONS(
   Callable :$eagerize = -> $idx {
       nqp::if(
         nqp::istype($idx,Whatever),
-        nqp::if(nqp::isconcrete(SELF),SELF.cache.elems,0),
+        nqp::if(nqp::isconcrete(SELF),SELF.elems,0),
         SELF.EXISTS-POS($idx)
       )
   }
@@ -398,33 +398,33 @@ multi sub postcircumfix:<[ ]>(\SELF,Callable:D $block,:$v!,*%other) is raw {
 
 # @a[*]
 multi sub postcircumfix:<[ ]>( \SELF, Whatever:D ) is raw {
-    SELF[^SELF.cache.elems];
+    SELF[^SELF.elems];
 }
 multi sub postcircumfix:<[ ]>( \SELF, Whatever:D, Mu \assignee ) is raw {
-    SELF[^SELF.cache.elems] = assignee;
+    SELF[^SELF.elems] = assignee;
 }
 multi sub postcircumfix:<[ ]>(\SELF, Whatever:D, :$BIND!) is raw {
     X::Bind::Slice.new(type => SELF.WHAT).throw;
 }
 multi sub postcircumfix:<[ ]>(\SELF, Whatever:D, :$delete!, *%other) is raw {
-    SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'delete', $delete, %other );
+    SLICE_MORE_LIST( SELF, ^SELF.elems, 'delete', $delete, %other );
 }
 multi sub postcircumfix:<[ ]>(\SELF, Whatever:D, :$exists!, *%other) is raw {
-    SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'exists', $exists, %other );
+    SLICE_MORE_LIST( SELF, ^SELF.elems, 'exists', $exists, %other );
 }
 multi sub postcircumfix:<[ ]>(\SELF, Whatever:D, :$kv!, *%other) is raw {
-    SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'kv', $kv, %other );
+    SLICE_MORE_LIST( SELF, ^SELF.elems, 'kv', $kv, %other );
 }
 multi sub postcircumfix:<[ ]>(\SELF, Whatever:D, :$p!, *%other) is raw {
-    SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'p', $p, %other );
+    SLICE_MORE_LIST( SELF, ^SELF.elems, 'p', $p, %other );
 }
 multi sub postcircumfix:<[ ]>(\SELF, Whatever:D, :$k!, *%other) is raw {
-    SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'k', $k, %other );
+    SLICE_MORE_LIST( SELF, ^SELF.elems, 'k', $k, %other );
 }
 multi sub postcircumfix:<[ ]>(\SELF, Whatever:D, :$v!, *%other) is raw {
     nqp::elems(nqp::getattr(%other,Map,'$!storage'))
-      ?? SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'v', $v, %other )
-      !! SELF[^SELF.cache.elems];
+      ?? SLICE_MORE_LIST( SELF, ^SELF.elems, 'v', $v, %other )
+      !! SELF[^SELF.elems];
 }
 
 # @a[**]
@@ -440,24 +440,24 @@ multi sub postcircumfix:<[ ]>(\SELF, :$BIND!) is raw {
     X::Bind::ZenSlice.new(type => SELF.WHAT).throw;
 }
 multi sub postcircumfix:<[ ]>(\SELF, :$delete!, *%other) is raw {
-    SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'delete', $delete, %other );
+    SLICE_MORE_LIST( SELF, ^SELF.elems, 'delete', $delete, %other );
 }
 multi sub postcircumfix:<[ ]>(\SELF, :$exists!, *%other) is raw {
-    SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'exists', $exists, %other );
+    SLICE_MORE_LIST( SELF, ^SELF.elems, 'exists', $exists, %other );
 }
 multi sub postcircumfix:<[ ]>(\SELF, :$kv!, *%other) is raw {
-    SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'kv', $kv, %other );
+    SLICE_MORE_LIST( SELF, ^SELF.elems, 'kv', $kv, %other );
 }
 multi sub postcircumfix:<[ ]>(\SELF, :$p!, *%other) is raw {
-    SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'p', $p, %other );
+    SLICE_MORE_LIST( SELF, ^SELF.elems, 'p', $p, %other );
 }
 multi sub postcircumfix:<[ ]>(\SELF, :$k!, *%other) is raw {
-    SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'k', $k, %other );
+    SLICE_MORE_LIST( SELF, ^SELF.elems, 'k', $k, %other );
 }
 multi sub postcircumfix:<[ ]>(\SELF, :$v!, *%other) is raw {
     nqp::elems(nqp::getattr(%other,Map,'$!storage'))
-      ?? SLICE_MORE_LIST( SELF, ^SELF.cache.elems, 'v', $v, %other )
-      !! SELF[^SELF.cache.elems];
+      ?? SLICE_MORE_LIST( SELF, ^SELF.elems, 'v', $v, %other )
+      !! SELF[^SELF.elems];
 }
 multi sub postcircumfix:<[ ]>(\SELF, *%other) is raw {
     SELF.ZEN-POS(|%other);

diff --git a/src/core/multidim_slice.pm b/src/core/multidim_slice.pm
@@ -13,12 +13,12 @@ sub MD-ARRAY-SLICE-ONE-POSITION(\SELF, \indices, \idx, int $dim, \target) is raw
             MD-ARRAY-SLICE-ONE-POSITION(SELF.AT-POS(idx), indices, indices.AT-POS($next-dim), $next-dim, target)
         }
         elsif nqp::istype(idx, Whatever) {
-            for ^SELF.cache.elems {
+            for ^SELF.elems {
                 MD-ARRAY-SLICE-ONE-POSITION(SELF.AT-POS($_), indices, indices.AT-POS($next-dim), $next-dim, target)
             }
         }
         elsif nqp::istype(idx, Callable) {
-            MD-ARRAY-SLICE-ONE-POSITION(SELF, indices, idx.(|(SELF.cache.elems xx (idx.count == Inf ?? 1 !! idx.count))), $dim, target);
+            MD-ARRAY-SLICE-ONE-POSITION(SELF, indices, idx.(|(SELF.elems xx (idx.count == Inf ?? 1 !! idx.count))), $dim, target);
         }
         else  {
             MD-ARRAY-SLICE-ONE-POSITION(SELF.AT-POS(idx.Int), indices, indices.AT-POS($next-dim), $next-dim, target)
@@ -34,12 +34,12 @@ sub MD-ARRAY-SLICE-ONE-POSITION(\SELF, \indices, \idx, int $dim, \target) is raw
             nqp::push(target, SELF.AT-POS(idx))
         }
         elsif nqp::istype(idx, Whatever) {
-            for ^SELF.cache.elems {
+            for ^SELF.elems {
                 nqp::push(target, SELF.AT-POS($_))
             }
         }
         elsif nqp::istype(idx, Callable) {
-            nqp::push(target, SELF.AT-POS(idx.(|(SELF.cache.elems xx (idx.count == Inf ?? 1 !! idx.count)))))
+            nqp::push(target, SELF.AT-POS(idx.(|(SELF.elems xx (idx.count == Inf ?? 1 !! idx.count)))))
         }
         else {
             nqp::push(target, SELF.AT-POS(idx.Int))