From e0aa3b2b16180510c956bccda84b0cb3132b9228 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Fri, 2 Feb 2018 23:25:34 +0100
Subject: [PATCH] DoCall: add missing TruffleBoundary and set correct type of
the args promises (supplied)
---
.../src/com/oracle/truffle/r/nodes/builtin/base/DoCall.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DoCall.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DoCall.java
index 78f86f0066..180588e906 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DoCall.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DoCall.java
@@ -236,7 +236,7 @@ public abstract class DoCall extends RBuiltinNode.Arg4 implements InternalRSynta
@TruffleBoundary
private RPromise createLanguagePromise(MaterializedFrame promiseFrame, RLanguage arg) {
Closure closure = languagesClosureCache.getOrCreatePromiseClosure(arg.getRep());
- return RDataFactory.createPromise(PromiseState.Default, closure, promiseFrame);
+ return RDataFactory.createPromise(PromiseState.Supplied, closure, promiseFrame);
}
@TruffleBoundary
@@ -283,7 +283,8 @@ public abstract class DoCall extends RBuiltinNode.Arg4 implements InternalRSynta
return new SlowPathExplicitCall();
}
- public Object execute(VirtualFrame evalFrame, RCaller caller, RFunction func, RArgsValuesAndNames args) {
+ @TruffleBoundary
+ public Object execute(MaterializedFrame evalFrame, RCaller caller, RFunction func, RArgsValuesAndNames args) {
slowPathCallNode = insert(RExplicitCallNode.create());
return slowPathCallNode.execute(evalFrame, func, args, caller);
}
--
GitLab