Add a number of missing deconts

Fix for R#2167
rakudo · Aug 8, 2018 · fa73bb4 · fa73bb4
1 parent 74ea72e
commit fa73bb4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/core/Rakudo/QuantHash.pm6 b/src/core/Rakudo/QuantHash.pm6
@@ -317,15 +317,18 @@ my class Rakudo::QuantHash {
     method ADD-PAIRS-TO-SET(\elems,Mu \iterator) {
         nqp::stmts(
           nqp::until(
-            nqp::eqaddr((my $pulled := iterator.pull-one),IterationEnd),
+            nqp::eqaddr(
+              (my $pulled := nqp::decont(iterator.pull-one)),
+              IterationEnd
+            ),
             nqp::if(
               nqp::istype($pulled,Pair),
               nqp::if(
-                nqp::getattr(nqp::decont($pulled),Pair,'$!value'),
+                nqp::getattr($pulled,Pair,'$!value'),
                 nqp::bindkey(
                   elems,
-                  nqp::getattr(nqp::decont($pulled),Pair,'$!key').WHICH,
-                  nqp::getattr(nqp::decont($pulled),Pair,'$!key')
+                  nqp::getattr($pulled,Pair,'$!key').WHICH,
+                  nqp::getattr($pulled,Pair,'$!key')
                 )
               ),
               nqp::bindkey(elems,$pulled.WHICH,$pulled)
@@ -432,7 +435,7 @@ my class Rakudo::QuantHash {
           (my $elems := nqp::clone(elems)),
           nqp::until(
             nqp::eqaddr(                            # end of iterator?
-              (my $pulled := iterator.pull-one),
+              (my $pulled := nqp::decont(iterator.pull-one)),
               IterationEnd
             ) || nqp::not_i(nqp::elems($elems)),    # nothing left to remove?
             nqp::if(
@@ -579,7 +582,10 @@ my class Rakudo::QuantHash {
     method ADD-ITERATOR-TO-BAG(\elems,Mu \iterator) {
         nqp::stmts(
           nqp::until(
-            nqp::eqaddr((my $pulled := iterator.pull-one),IterationEnd),
+            nqp::eqaddr(
+              (my $pulled := nqp::decont(iterator.pull-one)),
+              IterationEnd
+            ),
             nqp::if(
               nqp::existskey(elems,(my $WHICH := $pulled.WHICH)),
               nqp::stmts(

diff --git a/src/core/set_elem.pm6 b/src/core/set_elem.pm6
@@ -54,7 +54,10 @@ multi sub infix:<(elem)>(Any $a, Iterator:D $b --> Bool:D) {
       nqp::stmts(
         (my str $needle = $a.WHICH),
         nqp::until(
-          nqp::eqaddr((my $pulled := $b.pull-one),IterationEnd),
+          nqp::eqaddr(
+            (my $pulled := nqp::decont($b.pull-one)),
+            IterationEnd
+          ),
           nqp::if(
             nqp::iseq_s($needle,$pulled.WHICH),
             return True