From f2e935e9d35445bd1344af7ad9a4ee54ba1ab47d Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Thu, 15 Jun 2017 12:13:14 +0200
Subject: [PATCH] Remove not RPromise assertions from InternalNode
It turns out some .Internals are happy with getting a promise as an argument.
Example of this is lazyLoadDBinsertValue, which is in makeLazyLoadDB invoked
with result taken from another internal getVarsFromFrame, which is supposed
to return a promise.
---
.../com/oracle/truffle/r/nodes/builtin/InternalNode.java | 6 ------
1 file changed, 6 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/InternalNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/InternalNode.java
index 7b9821cf93..7fceec433d 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/InternalNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/builtin/InternalNode.java
@@ -43,7 +43,6 @@ import com.oracle.truffle.r.runtime.context.RContext;
import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
import com.oracle.truffle.r.runtime.data.REmpty;
import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RPromise;
import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
import com.oracle.truffle.r.runtime.nodes.RBaseNode;
import com.oracle.truffle.r.runtime.nodes.RNode;
@@ -246,7 +245,6 @@ public abstract class InternalNode extends OperatorNode {
Object[] args = new Object[arguments.length];
for (int i = 0; i < args.length; i++) {
args[i] = arguments[i].execute(frame);
- assert !(args[i] instanceof RPromise);
}
return args;
}
@@ -275,7 +273,6 @@ public abstract class InternalNode extends OperatorNode {
value = forcePromises(frame, (RArgsValuesAndNames) value);
}
args[i] = value;
- assert !(args[i] instanceof RPromise);
}
return args;
}
@@ -284,7 +281,6 @@ public abstract class InternalNode extends OperatorNode {
Object[] array = new Object[varArgs.getLength()];
for (int i = 0; i < array.length; i++) {
array[i] = promiseHelper.checkEvaluate(frame, varArgs.getArgument(i));
- assert !(array[i] instanceof RPromise);
}
return new RArgsValuesAndNames(array, varArgs.getSignature());
}
@@ -307,12 +303,10 @@ public abstract class InternalNode extends OperatorNode {
for (int i = 0; i < args.length - 1; i++) {
args[i] = arguments[i].execute(frame);
- assert !(args[i] instanceof RPromise);
}
Object[] varArgs = new Object[arguments.length - (factory.getSignature().getLength() - 1)];
for (int i = 0; i < varArgs.length; i++) {
varArgs[i] = arguments[args.length - 1 + i].execute(frame);
- assert !(varArgs[i] instanceof RPromise);
}
args[args.length - 1] = new RArgsValuesAndNames(varArgs, ArgumentsSignature.empty(varArgs.length));
return args;
--
GitLab