RT #117583: guard against NULL container spec

rakudo · Apr 13, 2013 · 070f3a4 · 070f3a4
1 parent f0aa5a6
commit 070f3a4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Perl6/Metamodel/BOOTSTRAP.pm b/src/Perl6/Metamodel/BOOTSTRAP.pm
@@ -445,15 +445,15 @@ BEGIN {
                 nqp::die("Cannot use 'is rw' on an optional parameter");
             }
             my $cd := nqp::getattr($dcself, Parameter, '$!container_descriptor');
-            if $cd { $cd.set_rw(1) }
+            if nqp::defined($cd) { $cd.set_rw(1) }
             nqp::bindattr_i($dcself, Parameter, '$!flags', $flags + $SIG_ELEM_IS_RW);
-            $dcself
+            nqp::p6bool(nqp::defined($dcself));
         }));
     Parameter.HOW.add_method(Parameter, 'set_copy', static(sub ($self) {
             my $SIG_ELEM_IS_COPY := 512;
             my $dcself := nqp::decont($self);
             my $cd     := nqp::getattr($dcself, Parameter, '$!container_descriptor');
-            if $cd { $cd.set_rw(1) }
+            if nqp::defined($cd) { $cd.set_rw(1) }
             nqp::bindattr_i($dcself, Parameter, '$!flags',
                 nqp::getattr_i($dcself, Parameter, '$!flags') + $SIG_ELEM_IS_COPY);
             $dcself