Switch is required to new initialization scheme

Only one spectest regression from this, which involves a native str attribute with `is required`, which was probably most getting lucky before this point.
rakudo · Dec 7, 2021 · bdb0cc2 · bdb0cc2
1 parent c719eab
commit bdb0cc2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -3881,13 +3881,15 @@ class Perl6::World is HLL::World {
                         elsif $code == 8 {
 
 # nqp::unless(
-#   nqp::attrinited(self,Foo,'$!a'),
+#   nqp::p6attrinited(nqp::getattr(self,Foo,'$!a')),
 #   X::Attribute::Required.new(name => '$!a', why => (value))
 # ),
                             $stmts.push(
                               QAST::Op.new( :op<unless>,
-                                QAST::Op.new( :op<attrinited>,
-                                  $!self, $class, $attr
+                                QAST::Op.new( :op<p6attrinited>,
+                                  QAST::Op.new( :op<getattr>,
+                                    $!self, $class, $attr
+                                  )
                                 ),
                                 QAST::Op.new( :op<callmethod>, :name<throw>,
                                   QAST::Op.new( :op<callmethod>, :name<new>,

diff --git a/src/core.c/Mu.pm6 b/src/core.c/Mu.pm6
@@ -269,9 +269,11 @@ my class Mu { # declared in BOOTSTRAP
                       nqp::if(
                         nqp::iseq_i($code,8),
                         nqp::unless(             # 8
-                          nqp::attrinited(self,
-                            nqp::atpos($task,1),
-                            nqp::atpos($task,2)
+                          nqp::p6attrinited(
+                            nqp::getattr(self,
+                              nqp::atpos($task,1),
+                              nqp::atpos($task,2)
+                            )
                           ),
                           X::Attribute::Required.new(
                             name => nqp::atpos($task,2),
@@ -511,9 +513,11 @@ my class Mu { # declared in BOOTSTRAP
                       nqp::if(
                         nqp::iseq_i($code,8),
                         nqp::unless(             # 8
-                          nqp::attrinited(self,
-                            nqp::atpos($task,1),
-                            nqp::atpos($task,2)
+                          nqp::p6attrinited(
+                            nqp::getattr(self,
+                              nqp::atpos($task,1),
+                              nqp::atpos($task,2)
+                            )
                           ),
                           X::Attribute::Required.new(
                             name => nqp::atpos($task,2),