Fix X:: resolutions to be done in the setting.

We already caught most of these before now, but missed these ones.
rakudo · Dec 13, 2015 · 7ecba50 · 7ecba50
1 parent 3c81e33
commit 7ecba50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -3932,7 +3932,7 @@ Compilation unit '$file' contained the following violations:
                 nqp::push(@redecl, $cur_key);
                 $*W.install_lexical_symbol($block, $cur_key,
                     $*W.find_symbol(['Failure']).new(
-                        $*W.find_symbol(['X', 'PoisonedAlias']).new(
+                        $*W.find_symbol(['X', 'PoisonedAlias'], :setting-only).new(
                             :alias($cur_key), :package-type<enum>, :package-name($name)
                         )
                     )
@@ -4918,7 +4918,7 @@ Compilation unit '$file' contained the following violations:
         # we don't always have X::StubCode available.  If that
         # is the case, fall back to using the string variant
         try {
-            my $X_StubCode := $*W.find_symbol(['X', 'StubCode']);
+            my $X_StubCode := $*W.find_symbol(['X', 'StubCode'], :setting-only);
             $past[0].named('message');
             $past[0] := QAST::Op.new(
                 :op('callmethod'), :name('new'),

diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -3731,7 +3731,7 @@ class Perl6::World is HLL::World {
         %opts<worries> := p6ize_recursive(@*WORRIES) if @*WORRIES;
         %opts<filename> := nqp::box_s(self.current_file,self.find_symbol(['Str']));
         try {
-            my $group_type := self.find_symbol(['X', 'Comp', 'Group']);
+            my $group_type := self.find_symbol(['X', 'Comp', 'Group'], :setting-only);
             return $group_type.new(|%opts);
             CATCH {
                 nqp::print("Error while constructing error object:");
@@ -3970,7 +3970,7 @@ class Perl6::World is HLL::World {
         my int $found_xcbt := 0;
         my $x_comp_bt;
         try {
-            $x_comp_bt := self.find_symbol(['X', 'Comp', 'BeginTime']);
+            $x_comp_bt := self.find_symbol(['X', 'Comp', 'BeginTime'], :setting-only);
             $found_xcbt++;
         }
         if $found_xcbt {
@@ -3994,7 +3994,7 @@ class Perl6::World is HLL::World {
         my $p6ex := $coercer($err);
         unless nqp::can($p6ex, 'SET_FILE_LINE') {
             try {
-                my $x_comp := self.find_symbol(['X', 'Comp']);
+                my $x_comp := self.find_symbol(['X', 'Comp'], :setting-only);
                 $p6ex.HOW.mixin($p6ex, $x_comp).BUILD_LEAST_DERIVED(nqp::hash());
             }
         }