From f56121d16f17d40b92ec5a091fd360413496365a Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Fri, 10 Aug 2018 10:23:41 +0200
Subject: [PATCH] Update Truffle import and fix deprecations
---
.../com/oracle/truffle/r/nodes/builtin/base/Names.java | 2 +-
.../truffle/r/nodes/builtin/fastr/FastRInterop.java | 2 +-
.../truffle/r/test/engine/interop/AbstractMRTest.java | 4 ++--
.../truffle/r/test/engine/interop/RFunctionMRTest.java | 8 ++++----
mx.fastr/suite.py | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Names.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Names.java
index 2440a11fac..d929815797 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Names.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Names.java
@@ -101,7 +101,7 @@ public abstract class Names extends RBuiltinNode.Arg1 {
if (env.isHostObject(obj) && !(env.asHostObject(obj) instanceof Class)) {
if (executeNode == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
- executeNode = insert(Message.createExecute(0).createNode());
+ executeNode = insert(Message.EXECUTE.createNode());
}
try {
TruffleObject clazzStatic = context.toJavaStatic(obj, readNode, executeNode);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
index fb8aeefb59..b53c7509e5 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
@@ -975,7 +975,7 @@ public class FastRInterop {
@Specialization(guards = {"isForeignObject(clazz)"})
@TruffleBoundary
public Object interopNew(TruffleObject clazz, RArgsValuesAndNames args,
- @Cached("createNew(0).createNode()") Node sendNew,
+ @Cached("NEW.createNode()") Node sendNew,
@Cached("create()") R2Foreign r2Foreign,
@Cached("create()") Foreign2R foreign2R) {
try {
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/AbstractMRTest.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/AbstractMRTest.java
index 50155d209f..d4205f7659 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/AbstractMRTest.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/AbstractMRTest.java
@@ -127,7 +127,7 @@ public abstract class AbstractMRTest {
for (TruffleObject obj : createTruffleObjects()) {
try {
// TODO if the need appears, also provide for args for execute
- ForeignAccess.sendExecute(Message.createExecute(0).createNode(), obj);
+ ForeignAccess.sendExecute(Message.EXECUTE.createNode(), obj);
assertEquals(obj.getClass().getSimpleName() + " " + obj + " IS_EXECUTABLE", true, ForeignAccess.sendIsExecutable(Message.IS_EXECUTABLE.createNode(), obj));
} catch (UnsupportedTypeException | ArityException e) {
throw e;
@@ -142,7 +142,7 @@ public abstract class AbstractMRTest {
for (TruffleObject obj : createTruffleObjects()) {
try {
// TODO if the need appears, also provide for args for new
- ForeignAccess.sendNew(Message.createNew(0).createNode(), obj);
+ ForeignAccess.sendNew(Message.NEW.createNode(), obj);
assertEquals(obj.getClass().getSimpleName() + " " + obj + " IS_INSTANTIABLE", true, ForeignAccess.sendIsInstantiable(Message.IS_INSTANTIABLE.createNode(), obj));
} catch (UnsupportedTypeException | ArityException e) {
throw e;
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/RFunctionMRTest.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/RFunctionMRTest.java
index ac786f3080..6e93b2b5e2 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/RFunctionMRTest.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/RFunctionMRTest.java
@@ -41,17 +41,17 @@ public class RFunctionMRTest extends AbstractMRTest {
RFunction f = create("function() {}");
assertTrue(ForeignAccess.sendIsExecutable(Message.IS_EXECUTABLE.createNode(), f));
- TruffleObject result = (TruffleObject) ForeignAccess.sendExecute(Message.createExecute(0).createNode(), f);
+ TruffleObject result = (TruffleObject) ForeignAccess.sendExecute(Message.EXECUTE.createNode(), f);
assertTrue(ForeignAccess.sendIsNull(Message.IS_NULL.createNode(), result));
f = create("function() {1L}");
- assertSingletonVector(1, ForeignAccess.sendExecute(Message.createExecute(0).createNode(), f));
+ assertSingletonVector(1, ForeignAccess.sendExecute(Message.EXECUTE.createNode(), f));
f = create("function() {1}");
- assertSingletonVector(1.0, ForeignAccess.sendExecute(Message.createExecute(0).createNode(), f));
+ assertSingletonVector(1.0, ForeignAccess.sendExecute(Message.EXECUTE.createNode(), f));
f = create("function() {TRUE}");
- assertSingletonVector(true, ForeignAccess.sendExecute(Message.createExecute(0).createNode(), f));
+ assertSingletonVector(true, ForeignAccess.sendExecute(Message.EXECUTE.createNode(), f));
f = create("function(a) {a}");
assertSingletonVector("abc", ForeignAccess.sendExecute(Message.createExecute(1).createNode(), f, "abc"));
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 4f28f735be..ac48d796fd 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -7,7 +7,7 @@ suite = {
{
"name" : "truffle",
"subdir" : True,
- "version" : "7a94c71966b0c41780035f80020563949180ef47",
+ "version" : "ddbf8fef5b00fe4344d6f2e260c590622b2030bd",
"urls" : [
{"url" : "https://github.com/graalvm/graal", "kind" : "git"},
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
--
GitLab