We run into code-gen issues for routines that evaluate to something v…

…oid; avoid (heh, get it) that.
rakudo · Jul 9, 2011 · 63e2719 · 63e2719
1 parent 2f5b530
commit 63e2719
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/core/EnumMap.pm b/src/core/EnumMap.pm
@@ -44,7 +44,8 @@ my class EnumMap does Associative {
     method STORE_AT_KEY(Str \$key, Mu \$value) {
         pir::defined($!storage) ||
             nqp::bindattr(self, EnumMap, '$!storage', pir::new__Ps('Hash'));
-        pir::set__2QsP($!storage, nqp::unbox_s($key), $value)
+        pir::set__2QsP($!storage, nqp::unbox_s($key), $value);
+        $value # XXX PAST bug, it seems; the 2 in the above sig isn't followed
     }
 
     method ARGLIST_FLATTENABLE() { $!storage }

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -6,10 +6,10 @@ my class Exception {
     }
 
     method throw() {
-        pir::throw__vP($!ex)
+        pir::throw__0P($!ex)
     }
     method rethrow() {
-        pir::rethrow__vP($!ex)
+        pir::rethrow__0P($!ex)
     }
 }
 

diff --git a/src/core/GatherIter.pm b/src/core/GatherIter.pm
@@ -70,7 +70,8 @@ class GatherIter is Iterator {
             .yield (taken)
             resume()
             goto gather_done    # should never get here
-        }
+        };
+        True
     }
 }
 

diff --git a/src/core/control.pm b/src/core/control.pm
@@ -67,7 +67,7 @@ my &proceed := -> {
     THROW(Nil, pir::const::CONTROL_CONTINUE)
 }
 
-sub die(*@msg) { pir::die(@msg.join('')) }
+sub die(*@msg) { pir::die__0P(@msg.join('')) }
 
 sub eval(Str $code, :$lang = 'perl6') {
     my $caller_ctx := Q:PIR {