RakuAST: fix accessing 6.e PseudoStash at compile time

6.e PseudoStash needs a $!package if one tries to make lookups in CORE::
rakudo · Mar 23, 2024 · 196fbee · MasterDuke17 · Mar 27, 2024 · 196fbee
1 parent 8467b84
commit 196fbee
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/src/Raku/ast/name.rakumod b/src/Raku/ast/name.rakumod
@@ -212,12 +212,9 @@ class RakuAST::Name
         if $*IMPL-COMPILE-DYNAMICALLY && $!parts[0].name eq 'CORE' {
             nqp::shift($!parts); #FIXME don't modify please
             my $PseudoStash := $PseudoStash-lookup.resolution.compile-time-value;
-            my $stash := nqp::create($PseudoStash);
+            my $package := Perl6::Metamodel::ModuleHOW.new_type(:name('CORE'));
             my $found-ctx := $context.setting;
-            nqp::bindattr($stash, Map, '$!storage', nqp::ctxlexpad($found-ctx)),
-            nqp::bindattr($stash, $PseudoStash, '$!ctx', $found-ctx),
-            nqp::bindattr_i($stash, $PseudoStash, '$!mode', STATIC_CHAIN),
-            nqp::setwho(Perl6::Metamodel::ModuleHOW.new_type(:name('CORE')), $stash);
+            my $stash := $PseudoStash.new($found-ctx, :$package);
             $context.ensure-sc($stash);
             $result := QAST::WVal.new(:value($stash));
         }

diff --git a/src/core.c/PseudoStash.rakumod b/src/core.c/PseudoStash.rakumod
@@ -12,14 +12,23 @@ my class PseudoStash is Map {
     my int constant PRECISE_SCOPE      = 4;
     my int constant REQUIRE_DYNAMIC    = 8;
 
-    method new() {
+    multi method new() {
         my $obj := nqp::create(self);
         my $ctx := nqp::ctxcaller(nqp::ctx());
         nqp::bindattr($obj, PseudoStash, '$!ctx', $ctx);
         nqp::bindattr($obj, Map, '$!storage', nqp::ctxlexpad($ctx));
         $obj
     }
 
+    multi method new(Mu $ctx is raw, :$mode = STATIC_CHAIN) {
+        my $obj := nqp::create(self);
+        my Mu $dctx := nqp::decont($ctx);
+        nqp::bindattr($obj, PseudoStash, '$!ctx', $dctx);
+        nqp::bindattr($obj, Map, '$!storage', nqp::ctxlexpad($ctx));
+        nqp::bindattr_i($obj, PseudoStash, '$!mode', nqp::decont($mode));
+        $obj
+    }
+
     sub ok-to-include(Mu \value) {
         nqp::not_i(nqp::istype(value,Code) && value.is-implementation-detail)
     }

diff --git a/src/core.e/PseudoStash.rakumod b/src/core.e/PseudoStash.rakumod
@@ -12,7 +12,7 @@ my class PseudoStash is CORE::v6c::PseudoStash {
     # A convenience shortcut
     my constant PseudoStash6c = CORE::v6c::PseudoStash;
 
-    method new(Mu :$ctx is raw, :$mode = STATIC_CHAIN) {
+    multi method new(Mu :$ctx is raw, :$mode = STATIC_CHAIN) {
         my $stash := nqp::create(self);
         my Mu $dctx := nqp::decont($ctx);
         $dctx := nqp::ctxcaller(nqp::ctx()) unless nqp::defined($dctx);
@@ -29,6 +29,17 @@ my class PseudoStash is CORE::v6c::PseudoStash {
         nqp::p6bindattrinvres($stash, Map, '$!storage', nqp::hash())
     }
 
+    multi method new(Mu $ctx is raw, Mu :$package!, :$mode = STATIC_CHAIN) {
+        my $stash := nqp::create(self);
+        my Mu $dctx := nqp::decont($ctx);
+        $dctx := nqp::ctxcaller(nqp::ctx()) unless nqp::defined($dctx);
+        nqp::bindattr($stash, PseudoStash6c, '$!ctx', nqp::decont($dctx));
+        nqp::bindattr_i($stash, PseudoStash6c, '$!mode', nqp::decont($mode));
+        nqp::bindattr($stash, PseudoStash, '$!package', nqp::decont($package));
+        # See the other method candidate
+        nqp::p6bindattrinvres($stash, Map, '$!storage', nqp::hash())
+    }
+
     my Int $id = 0;
     method NEW-PACKAGE(:$name = "<anon|{cas($id, {$_ + 1})}>", *%initargs ) is raw is implementation-detail
     {