take care of NativeRefs in nativecall op

If we would just decont as we did before, we'd strip the NativeRef container we need to be able to do assignments. This also needs a stage0 update, so we can use nqp::isont_[ins] here.
Raku · Apr 4, 2015 · 7533c6b · 7533c6b
1 parent 7aa9537
commit 7533c6b
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 5 deletions.
diff --git a/src/vm/moar/QAST/QASTOperationsMAST.nqp b/src/vm/moar/QAST/QASTOperationsMAST.nqp
@@ -2647,10 +2647,12 @@ QAST::MASTOperations.add_core_op('nativecall', -> $qastcomp, $op {
         my int $n := nqp::elems(@args);
         my $obj;
         while $i < $n {
-            $obj := nqp::decont(nqp::atpos(@args, $i));
-            nqp::bindpos(@args, $i, nqp::can($obj, 'cstr')
-                ?? nqp::decont($obj.cstr())
-                !! $obj);
+            $obj := nqp::atpos(@args, $i);
+            unless nqp::iscont_i($obj) || nqp::iscont_n($obj) || nqp::iscont_s($obj) {
+                nqp::bindpos(@args, $i, nqp::can($obj, 'cstr')
+                    ?? nqp::decont($obj.cstr())
+                    !! nqp::decont($obj));
+            }
             $i++;
         }
         @args

diff --git a/src/vm/moar/stage0/MASTNodes.moarvm b/src/vm/moar/stage0/MASTNodes.moarvm
diff --git a/src/vm/moar/stage0/MASTOps.moarvm b/src/vm/moar/stage0/MASTOps.moarvm
diff --git a/src/vm/moar/stage0/ModuleLoader.moarvm b/src/vm/moar/stage0/ModuleLoader.moarvm
diff --git a/src/vm/moar/stage0/NQPCORE.setting.moarvm b/src/vm/moar/stage0/NQPCORE.setting.moarvm
diff --git a/src/vm/moar/stage0/NQPHLL.moarvm b/src/vm/moar/stage0/NQPHLL.moarvm
diff --git a/src/vm/moar/stage0/NQPP6QRegex.moarvm b/src/vm/moar/stage0/NQPP6QRegex.moarvm
diff --git a/src/vm/moar/stage0/QAST.moarvm b/src/vm/moar/stage0/QAST.moarvm
diff --git a/src/vm/moar/stage0/QASTNode.moarvm b/src/vm/moar/stage0/QASTNode.moarvm
diff --git a/src/vm/moar/stage0/QRegex.moarvm b/src/vm/moar/stage0/QRegex.moarvm
diff --git a/src/vm/moar/stage0/nqp.moarvm b/src/vm/moar/stage0/nqp.moarvm
diff --git a/src/vm/moar/stage0/nqpmo.moarvm b/src/vm/moar/stage0/nqpmo.moarvm
diff --git a/tools/build/MOAR_REVISION b/tools/build/MOAR_REVISION
@@ -1 +1 @@
-2015.03-45-ge0f1cb0
+2015.03-48-g3eac8ba