Avoid more unrequired descriptor checks

rakudo · Aug 7, 2018 · 90f678f · 90f678f
1 parent 37c7e6e
commit 90f678f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/core/Any.pm6 b/src/core/Any.pm6
@@ -251,10 +251,10 @@ my class Any { # declared in BOOTSTRAP
 
     proto method AT-POS(|) is nodal {*}
     multi method AT-POS(Any:U \SELF: int \pos) is raw {
-        nqp::p6scalarfromdesc(ContainerDescriptor::VivifyArray.new(SELF, pos))
+        nqp::p6scalarfromcertaindesc(ContainerDescriptor::VivifyArray.new(SELF, pos))
     }
     multi method AT-POS(Any:U \SELF: Int:D \pos) is raw {
-        nqp::p6scalarfromdesc(ContainerDescriptor::VivifyArray.new(SELF, pos))
+        nqp::p6scalarfromcertaindesc(ContainerDescriptor::VivifyArray.new(SELF, pos))
     }
     multi method AT-POS(Any:U: Num:D \pos) is raw {
         nqp::isnanorinf(pos)
@@ -385,7 +385,7 @@ my class Any { # declared in BOOTSTRAP
         )
     }
     multi method AT-KEY(Any:U \SELF: \key) is raw {
-        nqp::p6scalarfromdesc(ContainerDescriptor::VivifyHash.new(SELF, key))
+        nqp::p6scalarfromcertaindesc(ContainerDescriptor::VivifyHash.new(SELF, key))
     }
 
     proto method BIND-KEY(|) is nodal {*}

diff --git a/src/core/Array.pm6 b/src/core/Array.pm6
@@ -137,7 +137,7 @@ my class Array { # declared in BOOTSTRAP
                     )
                 }
                 method hole(int $i) {
-                     nqp::p6scalarfromdesc(ContainerDescriptor::BindArrayPos.new(
+                     nqp::p6scalarfromcertaindesc(ContainerDescriptor::BindArrayPos.new(
                          $!descriptor, $!reified, $i))
                 }
                 method done() is raw {
@@ -331,7 +331,7 @@ my class Array { # declared in BOOTSTRAP
             multi method AT-POS(Int:D \pos) {
                 nqp::ifnull(
                   nqp::atpos(nqp::getattr(self,List,'$!reified'),pos),
-                  nqp::p6scalarfromdesc(ContainerDescriptor::BindArrayPos.new(
+                  nqp::p6scalarfromcertaindesc(ContainerDescriptor::BindArrayPos.new(
                     $!descriptor, nqp::getattr(self,List,'$!reified'), pos))
                 )
             }
@@ -386,7 +386,7 @@ my class Array { # declared in BOOTSTRAP
                       nqp::bindpos(
                         $reified,
                         $i,
-                        nqp::p6scalarfromdesc($!descriptor)
+                        nqp::p6scalarfromcertaindesc($!descriptor)
                       )
                     )
                   )
@@ -551,7 +551,7 @@ my class Array { # declared in BOOTSTRAP
                 nqp::bindpos(
                   nqp::getattr(self,List,'$!reified'),
                   $pos,
-                  nqp::p6scalarfromdesc($!descriptor)
+                  nqp::p6scalarfromcertaindesc($!descriptor)
                 ),
                 nqp::if(
                   nqp::isconcrete(nqp::getattr(self,List,'$!todo')),
@@ -566,22 +566,22 @@ my class Array { # declared in BOOTSTRAP
                       nqp::bindpos(              # outlander
                         nqp::getattr(self,List,'$!reified'),
                         $pos,
-                        nqp::p6scalarfromdesc($!descriptor)
+                        nqp::p6scalarfromcertaindesc($!descriptor)
                       )
                     )
                   ),
                   nqp::bindpos(                  # outlander without todo
                     nqp::getattr(self,List,'$!reified'),
                     $pos,
-                    nqp::p6scalarfromdesc($!descriptor)
+                    nqp::p6scalarfromcertaindesc($!descriptor)
                   )
                 )
               )
             ),
             nqp::bindpos(                        # new outlander
               nqp::bindattr(self,List,'$!reified',nqp::create(IterationBuffer)),
               $pos,
-              nqp::p6scalarfromdesc($!descriptor)
+              nqp::p6scalarfromcertaindesc($!descriptor)
             )
           ) = assignee
         )