Revert "bug fix for #4488"

This reverts commit d0a739f.
rakudo · Oct 19, 2021 · eb1c1f4 · eb1c1f4
1 parent d0a739f
commit eb1c1f4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/core.c/operators.pm6 b/src/core.c/operators.pm6
@@ -312,8 +312,6 @@ sub REQUIRE_IMPORT(
         $targetWHO := $block.AT-KEY($stubname).WHO;
         $sourceWHO := $GLOBALish.AT-KEY($stubname).WHO;
         $targetWHO.merge-symbols($sourceWHO);
-
-        try $targetWHO.merge-symbols($GLOBALish);
     }
     # Set the runtime values for compile time stub symbols
     for @syms {
@@ -326,6 +324,10 @@ sub REQUIRE_IMPORT(
     if @missing {
         X::Import::MissingSymbols.new(:from($compunit.short-name), :@missing).throw;
     }
+    nqp::gethllsym('Raku','ModuleLoader').merge_globals(
+        $merge-globals-target.AT-KEY($stubname).WHO,
+        $GLOBALish,
+    ) if $stubname;
     # Merge GLOBAL from compunit.
     nqp::gethllsym('Raku','ModuleLoader').merge_globals(
         $block<%REQUIRE_SYMBOLS>,