Fix for #122355

rakudo · Jul 21, 2014 · 043cc03 · 043cc03
1 parent 0f73b73
commit 043cc03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -184,7 +184,7 @@ do {
                 nqp::printfh($err, $e.Str);
                 nqp::printfh($err, "\n");
             }
-            $_() for nqp::hllize(nqp::getcurhllsym('@END_PHASERS'));
+            THE_END();
         }
         if $! {
 #?if parrot

diff --git a/src/core/control.pm b/src/core/control.pm
@@ -173,11 +173,16 @@ multi sub EVAL(Cool $code, :$lang = 'perl6', PseudoStash :$context) {
 }
 
 sub exit($status = 0) {
-    $_() for nqp::hllize(nqp::getcurhllsym('@END_PHASERS'));
+    THE_END();
     nqp::exit(nqp::unbox_i($status.Int));
     $status;
 }
 
+sub THE_END {
+    my @END := nqp::p6list(nqp::getcurhllsym("@END_PHASERS"), Array, Mu);
+    while @END.shift -> $end { $end() };
+}
+
 my class Proc::Status { ... }
 
 sub run(*@args ($, *@)) {