Switch Array vivification to not use $!whence

rakudo · Jun 15, 2018 · 761c0bb · 761c0bb
1 parent 82702e9
commit 761c0bb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/src/Perl6/Metamodel/ContainerDescriptor.nqp b/src/Perl6/Metamodel/ContainerDescriptor.nqp
@@ -66,3 +66,29 @@ class Perl6::Metamodel::ContainerDescriptor::BindArrayPos
         nqp::bindpos($!target, $!pos, $scalar);
     }
 }
+
+class Perl6::Metamodel::ContainerDescriptor::VivifyArray
+        does Perl6::Metamodel::ContainerDescriptor::Whence {
+    has $!target;
+    has $!array;
+    has int $!pos;
+
+    method new($target, $array, int $pos) {
+        my $self := nqp::create(self);
+        nqp::bindattr($self, Perl6::Metamodel::ContainerDescriptor::VivifyArray,
+            '$!target', $target);
+        nqp::bindattr($self, Perl6::Metamodel::ContainerDescriptor::VivifyArray,
+            '$!array', $array);
+        nqp::bindattr_i($self, Perl6::Metamodel::ContainerDescriptor::VivifyArray,
+            '$!pos', $pos);
+        $self
+    }
+
+    method assigned($scalar) {
+        my $target := $!target;
+        my $array := nqp::isconcrete($target)
+            ?? $target
+            !! nqp::assign($target, $!array.new);
+        $array.BIND-POS($!pos, $scalar);
+    }
+}
diff --git a/src/core/Any.pm6 b/src/core/Any.pm6
@@ -251,30 +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::p6bindattrinvres(
-          my $scalar,
-          Scalar,
-          '$!whence',
-          -> { nqp::if(
-                 nqp::isconcrete(SELF),
-                 SELF,
-                 (SELF = Array.new)
-               ).BIND-POS(pos, $scalar)
-             }
-        )
+        nqp::p6scalarfromdesc(ContainerDescriptor::VivifyArray.new(SELF, Array, pos))
     }
     multi method AT-POS(Any:U \SELF: Int:D \pos) is raw {
-        nqp::p6bindattrinvres(
-          my $scalar,
-          Scalar,
-          '$!whence',
-          -> { nqp::if(
-                 nqp::isconcrete(SELF),
-                 SELF,
-                 (SELF = Array.new)
-               ).BIND-POS(pos, $scalar)
-             }
-        )
+        nqp::p6scalarfromdesc(ContainerDescriptor::VivifyArray.new(SELF, Array, pos))
     }
     multi method AT-POS(Any:U: Num:D \pos) is raw {
         nqp::isnanorinf(pos)