From ef6ad1e9b172194f2a2b3453ce840e6ad64112e0 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Tue, 24 Jul 2018 11:52:31 +0200
Subject: [PATCH] R2ForeingNodeGen#create replaced with R2Foreign#create
---
.../src/com/oracle/truffle/r/engine/EngineRootNode.java | 2 +-
.../src/com/oracle/truffle/r/engine/interop/ListMR.java | 2 +-
.../truffle/r/engine/interop/RArgsValuesAndNamesMR.java | 2 +-
.../com/oracle/truffle/r/engine/interop/REnvironmentMR.java | 2 +-
.../src/com/oracle/truffle/r/engine/interop/RFunctionMR.java | 2 +-
.../src/com/oracle/truffle/r/engine/interop/RS4ObjectMR.java | 2 +-
.../oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java | 4 ++--
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/EngineRootNode.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/EngineRootNode.java
index de446d27fb..70bb609cb0 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/EngineRootNode.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/EngineRootNode.java
@@ -58,7 +58,7 @@ class EngineRootNode extends RootNode {
private final ContextReference<RContext> contextReference;
@Child private EngineBodyNode bodyNode;
- @Child private R2Foreign r2Foreign = R2ForeignNodeGen.create();
+ @Child private R2Foreign r2Foreign = R2Foreign.create();
EngineRootNode(EngineBodyNode bodyNode, RContext context, SourceSection sourceSection, MaterializedFrame executionFrame) {
super(context.getLanguage());
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ListMR.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ListMR.java
index 597b0fb89a..abe412ecd6 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ListMR.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ListMR.java
@@ -395,7 +395,7 @@ public class ListMR {
private void initR2ForeignNode() {
if (r2Foreign == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
- r2Foreign = insert(R2ForeignNodeGen.create());
+ r2Foreign = insert(R2Foreign.create());
}
}
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RArgsValuesAndNamesMR.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RArgsValuesAndNamesMR.java
index f9c6519352..e1a439ff63 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RArgsValuesAndNamesMR.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RArgsValuesAndNamesMR.java
@@ -120,7 +120,7 @@ public class RArgsValuesAndNamesMR {
}
abstract static class RArgsValuesAndNamesReadImplNode extends Node {
- @Child private R2Foreign r2Foreign = R2ForeignNodeGen.create();
+ @Child private R2Foreign r2Foreign = R2Foreign.create();
private final ConditionProfile unknownIdentifier = ConditionProfile.createBinaryProfile();
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/REnvironmentMR.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/REnvironmentMR.java
index 709988c5c6..8c2e95c851 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/REnvironmentMR.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/REnvironmentMR.java
@@ -164,7 +164,7 @@ public class REnvironmentMR {
private void initR2ForeignNode() {
if (r2Foreign == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
- r2Foreign = insert(R2ForeignNodeGen.create());
+ r2Foreign = insert(R2Foreign.create());
}
}
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RFunctionMR.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RFunctionMR.java
index c654f15843..a01ac0bcf2 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RFunctionMR.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RFunctionMR.java
@@ -59,7 +59,7 @@ public class RFunctionMR {
@Resolve(message = "EXECUTE")
public abstract static class RFunctionExecuteNode extends Node {
@Child private Foreign2R foreign2R = Foreign2RNodeGen.create();
- @Child private R2Foreign r2Foreign = R2ForeignNodeGen.create();
+ @Child private R2Foreign r2Foreign = R2Foreign.create();
@Child private RExplicitCallNode call = RExplicitCallNode.create();
protected Object access(RFunction receiver, Object[] arguments) {
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RS4ObjectMR.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RS4ObjectMR.java
index 3b9f6cdd39..a98549f7cf 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RS4ObjectMR.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RS4ObjectMR.java
@@ -157,7 +157,7 @@ public class RS4ObjectMR {
if (r2Foreign == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
- r2Foreign = insert(R2ForeignNodeGen.create());
+ r2Foreign = insert(R2Foreign.create());
}
return r2Foreign.execute(value);
}
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 cf00af05aa..b248eea175 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
@@ -672,7 +672,7 @@ public class FastRInterop {
}
protected R2Foreign createR2Foreign() {
- return R2ForeignNodeGen.create();
+ return R2Foreign.create();
}
}
@@ -818,7 +818,7 @@ public class FastRInterop {
}
protected R2Foreign createR2Foreign() {
- return R2ForeignNodeGen.create();
+ return R2Foreign.create();
}
private static int[] getDim(boolean flat, RAbstractVector vec) {
--
GitLab