From 2062c0b5d60fc8939a6612f8b17a15e28e590a3a Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Thu, 5 Oct 2017 17:09:07 +0200
Subject: [PATCH] fix Child node access modifiers
---
.../interop/RAbstractVectorAccessFactory.java | 2 +-
.../engine/interop/RArgsValuesAndNamesMR.java | 2 +-
.../truffle/r/engine/interop/RPromiseMR.java | 6 +--
.../nfi/HandleNFIUpCallExceptionNode.java | 7 ++--
.../nodes/builtin/base/DynLoadFunctions.java | 6 +--
.../r/nodes/builtin/base/GrepFunctions.java | 42 +++++++++----------
.../r/nodes/builtin/base/InheritsBuiltin.java | 2 +-
.../r/nodes/builtin/base/LaFunctions.java | 2 +-
.../foreign/CallAndExternalFunctions.java | 12 +++---
.../system/ContextSystemFunctionFactory.java | 4 +-
.../nodes/attributes/RemoveAttributeNode.java | 2 +-
.../attributes/RemoveFixedAttributeNode.java | 2 +-
.../r/nodes/attributes/SetAttributeNode.java | 2 +-
.../call/RExplicitBaseEnvCallDispatcher.java | 4 +-
.../truffle/r/nodes/helpers/RFactorNodes.java | 2 +-
.../com/oracle/truffle/r/runtime/ffi/DLL.java | 4 +-
16 files changed, 50 insertions(+), 51 deletions(-)
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RAbstractVectorAccessFactory.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RAbstractVectorAccessFactory.java
index 6e7fdef102..0ac20c8270 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RAbstractVectorAccessFactory.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RAbstractVectorAccessFactory.java
@@ -181,7 +181,7 @@ public final class RAbstractVectorAccessFactory implements Factory26 {
}
abstract static class VectorKeyInfoRootNode extends InteropRootNode {
- @Child VectorKeyInfoImplNode keyInfoNode = VectorKeyInfoImplNodeGen.create();
+ @Child private VectorKeyInfoImplNode keyInfoNode = VectorKeyInfoImplNodeGen.create();
@Override
public final Object execute(VirtualFrame frame) {
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 2ab541ec03..73b2ae57b8 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
@@ -62,7 +62,7 @@ public class RArgsValuesAndNamesMR {
@Resolve(message = "READ")
public abstract static class RArgsValuesAndNamesReadNode extends Node {
- @Child RArgsValuesAndNamesReadImplNode readNode = RArgsValuesAndNamesReadImplNodeGen.create();
+ @Child private RArgsValuesAndNamesReadImplNode readNode = RArgsValuesAndNamesReadImplNodeGen.create();
protected Object access(RArgsValuesAndNames receiver, Object identifier) {
return readNode.execute(receiver, identifier);
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RPromiseMR.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RPromiseMR.java
index 51b01c4cd2..cfbf738137 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RPromiseMR.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RPromiseMR.java
@@ -52,7 +52,7 @@ public class RPromiseMR {
@Resolve(message = "READ")
public abstract static class RPromiseReadNode extends Node {
- @Child RPromiseReadImplNode readNode = RPromiseReadImplNodeGen.create();
+ @Child private RPromiseReadImplNode readNode = RPromiseReadImplNodeGen.create();
@TruffleBoundary
protected Object access(RPromise receiver, String field) {
@@ -62,7 +62,7 @@ public class RPromiseMR {
@Resolve(message = "WRITE")
public abstract static class RPromiseWriteNode extends Node {
- @Child RPromiseWriteImplNode writeNode = RPromiseWriteImplNodeGen.create();
+ @Child private RPromiseWriteImplNode writeNode = RPromiseWriteImplNodeGen.create();
protected Object access(RPromise receiver, String field, Object valueObj) {
return writeNode.execute(receiver, field, valueObj);
@@ -79,7 +79,7 @@ public class RPromiseMR {
@Resolve(message = "KEY_INFO")
public abstract static class RPromiseKeyInfoNode extends Node {
- @Child RPromiseKeyInfoImplNode keyInfoNode = RPromiseKeyInfoImplNodeGen.create();
+ @Child private RPromiseKeyInfoImplNode keyInfoNode = RPromiseKeyInfoImplNodeGen.create();
protected Object access(RPromise receiver, String identifier) {
return keyInfoNode.execute(receiver, identifier);
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/HandleNFIUpCallExceptionNode.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/HandleNFIUpCallExceptionNode.java
index d169d89d02..b1620ab092 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/HandleNFIUpCallExceptionNode.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/HandleNFIUpCallExceptionNode.java
@@ -24,12 +24,11 @@ package com.oracle.truffle.r.ffi.impl.nfi;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.r.runtime.context.RContext;
-import com.oracle.truffle.r.runtime.ffi.NativeFunction;
import com.oracle.truffle.r.runtime.ffi.CallRFFI.HandleUpCallExceptionNode;
+import com.oracle.truffle.r.runtime.ffi.NativeFunction;
public class HandleNFIUpCallExceptionNode extends Node implements HandleUpCallExceptionNode {
- @Child SetFlagNode setFlagNode = new SetFlagNode();
+ @Child private SetFlagNode setFlagNode = new SetFlagNode();
@Override
@TruffleBoundary
@@ -41,7 +40,7 @@ public class HandleNFIUpCallExceptionNode extends Node implements HandleUpCallEx
} else {
ex = new RuntimeException(originalEx);
}
- ((TruffleNFI_Context) RContext.getInstance().getStateRFFI()).setLastUpCallException(ex);
+ TruffleNFI_Context.getInstance().setLastUpCallException(ex);
}
private static final class SetFlagNode extends TruffleNFI_DownCallNode {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DynLoadFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DynLoadFunctions.java
index c871aa49bd..d0dce21f30 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DynLoadFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DynLoadFunctions.java
@@ -84,7 +84,7 @@ public class DynLoadFunctions {
@RBuiltin(name = "dyn.unload", visibility = OFF, kind = INTERNAL, parameterNames = {"lib"}, behavior = COMPLEX)
public abstract static class DynUnload extends RBuiltinNode.Arg1 {
- @Child DLL.UnloadNode dllUnloadNode = DLL.UnloadNode.create();
+ @Child private DLL.UnloadNode dllUnloadNode = DLL.UnloadNode.create();
static {
Casts casts = new Casts(DynUnload.class);
@@ -128,7 +128,7 @@ public class DynLoadFunctions {
@RBuiltin(name = "is.loaded", kind = INTERNAL, parameterNames = {"symbol", "PACKAGE", "type"}, behavior = READS_STATE)
public abstract static class IsLoaded extends RBuiltinNode.Arg3 {
- @Child DLL.RFindSymbolNode findSymbolNode = DLL.RFindSymbolNode.create();
+ @Child private DLL.RFindSymbolNode findSymbolNode = DLL.RFindSymbolNode.create();
static {
Casts casts = new Casts(IsLoaded.class);
@@ -164,7 +164,7 @@ public class DynLoadFunctions {
@RBuiltin(name = "getSymbolInfo", kind = INTERNAL, parameterNames = {"symbol", "package", "withRegistrationInfo"}, behavior = READS_STATE)
public abstract static class GetSymbolInfo extends RBuiltinNode.Arg3 {
- @Child DLL.RFindSymbolNode findSymbolNode = DLL.RFindSymbolNode.create();
+ @Child private DLL.RFindSymbolNode findSymbolNode = DLL.RFindSymbolNode.create();
static {
Casts casts = new Casts(GetSymbolInfo.class);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/GrepFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/GrepFunctions.java
index 45aa94bc53..6b3b9ef8ce 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/GrepFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/GrepFunctions.java
@@ -217,7 +217,7 @@ public class GrepFunctions {
}
protected static final class GrepCommonCodeNode extends CommonCodeNode {
- @Child PCRERFFI.ExecNode execNode = RFFIFactory.getPCRERFFI().createExecNode();
+ @Child private PCRERFFI.ExecNode execNode = RFFIFactory.getPCRERFFI().createExecNode();
protected Object doGrep(String patternArg, RAbstractStringVector vector, boolean ignoreCase, boolean value, boolean perlPar, boolean fixed,
@SuppressWarnings("unused") boolean useBytes, boolean invert, boolean grepl) {
@@ -421,7 +421,7 @@ public class GrepFunctions {
}
protected static final class SubCommonCodeNode extends CommonCodeNode {
- @Child PCRERFFI.ExecNode execNode = RFFIFactory.getPCRERFFI().createExecNode();
+ @Child private PCRERFFI.ExecNode execNode = RFFIFactory.getPCRERFFI().createExecNode();
protected RStringVector doSub(String patternArg, String replacementArg, RAbstractStringVector vector, boolean ignoreCase, boolean perlPar,
boolean fixedPar, @SuppressWarnings("unused") boolean useBytes, boolean gsub) {
@@ -738,15 +738,15 @@ public class GrepFunctions {
@RBuiltin(name = "regexpr", kind = INTERNAL, parameterNames = {"pattern", "text", "ignore.case", "perl", "fixed", "useBytes"}, behavior = PURE)
public abstract static class Regexpr extends RBuiltinNode.Arg6 {
- @Child SetFixedAttributeNode setMatchLengthAttrNode = SetFixedAttributeNode.create("match.length");
- @Child SetFixedAttributeNode setUseBytesAttrNode = SetFixedAttributeNode.create("useBytes");
- @Child SetFixedAttributeNode setCaptureStartAttrNode = SetFixedAttributeNode.create("capture.start");
- @Child SetFixedAttributeNode setCaptureLengthAttrNode = SetFixedAttributeNode.create("capture.length");
- @Child SetFixedAttributeNode setCaptureNamesAttrNode = SetFixedAttributeNode.create("capture.names");
- @Child SetFixedAttributeNode setDimNamesAttrNode = SetFixedAttributeNode.createDimNames();
- @Child PCRERFFI.ExecNode execNode = RFFIFactory.getPCRERFFI().createExecNode();
- @Child PCRERFFI.GetCaptureNamesNode getCaptureNamesNode = RFFIFactory.getPCRERFFI().createGetCaptureNamesNode();
- @Child PCRERFFI.GetCaptureCountNode getCaptureCountNode = RFFIFactory.getPCRERFFI().createGetCaptureCountNode();
+ @Child private SetFixedAttributeNode setMatchLengthAttrNode = SetFixedAttributeNode.create("match.length");
+ @Child private SetFixedAttributeNode setUseBytesAttrNode = SetFixedAttributeNode.create("useBytes");
+ @Child private SetFixedAttributeNode setCaptureStartAttrNode = SetFixedAttributeNode.create("capture.start");
+ @Child private SetFixedAttributeNode setCaptureLengthAttrNode = SetFixedAttributeNode.create("capture.length");
+ @Child private SetFixedAttributeNode setCaptureNamesAttrNode = SetFixedAttributeNode.create("capture.names");
+ @Child private SetFixedAttributeNode setDimNamesAttrNode = SetFixedAttributeNode.createDimNames();
+ @Child private PCRERFFI.ExecNode execNode = RFFIFactory.getPCRERFFI().createExecNode();
+ @Child private PCRERFFI.GetCaptureNamesNode getCaptureNamesNode = RFFIFactory.getPCRERFFI().createGetCaptureNamesNode();
+ @Child private PCRERFFI.GetCaptureCountNode getCaptureCountNode = RFFIFactory.getPCRERFFI().createGetCaptureCountNode();
static {
Casts casts = new Casts(Regexpr.class);
@@ -940,9 +940,9 @@ public class GrepFunctions {
@RBuiltin(name = "regexec", kind = INTERNAL, parameterNames = {"pattern", "text", "ignore.case", "fixed", "useBytes"}, behavior = PURE)
public abstract static class Regexec extends RBuiltinNode.Arg5 {
- @Child SetFixedAttributeNode setMatchLengthAttrNode = SetFixedAttributeNode.create("match.length");
- @Child SetFixedAttributeNode setUseBytesAttrNode = SetFixedAttributeNode.create("useBytes");
- @Child SetFixedAttributeNode setDimNamesAttrNode = SetFixedAttributeNode.createDimNames();
+ @Child private SetFixedAttributeNode setMatchLengthAttrNode = SetFixedAttributeNode.create("match.length");
+ @Child private SetFixedAttributeNode setUseBytesAttrNode = SetFixedAttributeNode.create("useBytes");
+ @Child private SetFixedAttributeNode setDimNamesAttrNode = SetFixedAttributeNode.createDimNames();
static {
Casts casts = new Casts(Regexec.class);
@@ -1051,12 +1051,12 @@ public class GrepFunctions {
@RBuiltin(name = "gregexpr", kind = INTERNAL, parameterNames = {"pattern", "text", "ignore.case", "perl", "fixed", "useBytes"}, behavior = PURE)
public abstract static class Gregexpr extends Regexpr {
- @Child SetFixedAttributeNode setMatchLengthAttrNode = SetFixedAttributeNode.create("match.length");
- @Child SetFixedAttributeNode setUseBytesAttrNode = SetFixedAttributeNode.create("useBytes");
- @Child SetFixedAttributeNode setCaptureStartAttrNode = SetFixedAttributeNode.create("capture.start");
- @Child SetFixedAttributeNode setCaptureLengthAttrNode = SetFixedAttributeNode.create("capture.length");
- @Child SetFixedAttributeNode setCaptureNamesAttrNode = SetFixedAttributeNode.create("capture.names");
- @Child SetFixedAttributeNode setDimNamesAttrNode = SetFixedAttributeNode.createDimNames();
+ @Child private SetFixedAttributeNode setMatchLengthAttrNode = SetFixedAttributeNode.create("match.length");
+ @Child private SetFixedAttributeNode setUseBytesAttrNode = SetFixedAttributeNode.create("useBytes");
+ @Child private SetFixedAttributeNode setCaptureStartAttrNode = SetFixedAttributeNode.create("capture.start");
+ @Child private SetFixedAttributeNode setCaptureLengthAttrNode = SetFixedAttributeNode.create("capture.length");
+ @Child private SetFixedAttributeNode setCaptureNamesAttrNode = SetFixedAttributeNode.create("capture.names");
+ @Child private SetFixedAttributeNode setDimNamesAttrNode = SetFixedAttributeNode.createDimNames();
static {
Casts casts = new Casts(Gregexpr.class);
@@ -1350,7 +1350,7 @@ public class GrepFunctions {
@ImportStatic(GrepFunctions.class)
@RBuiltin(name = "strsplit", kind = INTERNAL, parameterNames = {"x", "split", "fixed", "perl", "useBytes"}, behavior = PURE)
public abstract static class Strsplit extends RBuiltinNode.Arg5 {
- @Child PCRERFFI.ExecNode execNode = RFFIFactory.getPCRERFFI().createExecNode();
+ @Child private PCRERFFI.ExecNode execNode = RFFIFactory.getPCRERFFI().createExecNode();
static {
Casts casts = new Casts(Strsplit.class);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/InheritsBuiltin.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/InheritsBuiltin.java
index bcd8c7f39f..d597cdbf4d 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/InheritsBuiltin.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/InheritsBuiltin.java
@@ -29,7 +29,7 @@ import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
@RBuiltin(name = "inherits", kind = INTERNAL, parameterNames = {"x", "what", "which"}, behavior = PURE)
public abstract class InheritsBuiltin extends RBuiltinNode.Arg3 {
- @Child InheritsNode inheritsNode = InheritsNodeGen.create();
+ @Child private InheritsNode inheritsNode = InheritsNodeGen.create();
public abstract Object execute(Object x, Object what, Object which);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/LaFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/LaFunctions.java
index 66197049b7..a0ccf139a8 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/LaFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/LaFunctions.java
@@ -82,7 +82,7 @@ public class LaFunctions {
@RBuiltin(name = "La_version", kind = INTERNAL, parameterNames = {}, behavior = READS_STATE)
public abstract static class Version extends RBuiltinNode.Arg0 {
- @Child LapackRFFI.IlaverNode ilaverNode = RFFIFactory.getLapackRFFI().createIlaverNode();
+ @Child private LapackRFFI.IlaverNode ilaverNode = RFFIFactory.getLapackRFFI().createIlaverNode();
@Specialization
@TruffleBoundary
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/foreign/CallAndExternalFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/foreign/CallAndExternalFunctions.java
index c84b8b0cdb..d1d2b58ef7 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/foreign/CallAndExternalFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/foreign/CallAndExternalFunctions.java
@@ -224,8 +224,8 @@ public class CallAndExternalFunctions {
@RBuiltin(name = ".Call", kind = PRIMITIVE, parameterNames = {".NAME", "...", "PACKAGE"}, behavior = COMPLEX)
public abstract static class DotCall extends LookupAdapter {
- @Child CallRFFI.InvokeCallNode callRFFINode = RFFIFactory.getCallRFFI().createInvokeCallNode();
- @Child MaterializeNode materializeNode = MaterializeNode.create(true);
+ @Child private CallRFFI.InvokeCallNode callRFFINode = RFFIFactory.getCallRFFI().createInvokeCallNode();
+ @Child private MaterializeNode materializeNode = MaterializeNode.create(true);
static {
Casts.noCasts(DotCall.class);
@@ -734,7 +734,7 @@ public class CallAndExternalFunctions {
@RBuiltin(name = ".External", kind = PRIMITIVE, parameterNames = {".NAME", "...", "PACKAGE"}, behavior = COMPLEX)
public abstract static class DotExternal extends LookupAdapter {
- @Child CallRFFI.InvokeCallNode callRFFINode = RFFIFactory.getCallRFFI().createInvokeCallNode();
+ @Child private CallRFFI.InvokeCallNode callRFFINode = RFFIFactory.getCallRFFI().createInvokeCallNode();
static {
Casts.noCasts(DotExternal.class);
@@ -848,7 +848,7 @@ public class CallAndExternalFunctions {
*/
@CompilationFinal private Object op = null;
- @Child CallRFFI.InvokeCallNode callRFFINode = RFFIFactory.getCallRFFI().createInvokeCallNode();
+ @Child private CallRFFI.InvokeCallNode callRFFINode = RFFIFactory.getCallRFFI().createInvokeCallNode();
static {
Casts.noCasts(DotExternal2.class);
@@ -934,7 +934,7 @@ public class CallAndExternalFunctions {
@RBuiltin(name = ".External.graphics", kind = PRIMITIVE, parameterNames = {".NAME", "...", "PACKAGE"}, behavior = COMPLEX)
public abstract static class DotExternalGraphics extends LookupAdapter {
- @Child CallRFFI.InvokeCallNode callRFFINode = RFFIFactory.getCallRFFI().createInvokeCallNode();
+ @Child private CallRFFI.InvokeCallNode callRFFINode = RFFIFactory.getCallRFFI().createInvokeCallNode();
static {
Casts.noCasts(DotExternalGraphics.class);
@@ -989,7 +989,7 @@ public class CallAndExternalFunctions {
@RBuiltin(name = ".Call.graphics", kind = PRIMITIVE, parameterNames = {".NAME", "...", "PACKAGE"}, behavior = COMPLEX)
public abstract static class DotCallGraphics extends LookupAdapter {
- @Child CallRFFI.InvokeCallNode callRFFINode = RFFIFactory.getCallRFFI().createInvokeCallNode();
+ @Child private CallRFFI.InvokeCallNode callRFFINode = RFFIFactory.getCallRFFI().createInvokeCallNode();
static {
Casts.noCasts(DotCallGraphics.class);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/system/ContextSystemFunctionFactory.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/system/ContextSystemFunctionFactory.java
index cfb7d5c70a..9e7d51c0e0 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/system/ContextSystemFunctionFactory.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/system/ContextSystemFunctionFactory.java
@@ -47,7 +47,7 @@ public class ContextSystemFunctionFactory extends SystemFunctionFactory {
}
public abstract static class ContextRSystemFunctionNode extends ContextSystemFunctionNode {
- @Child FastRContext.R contextRNode;
+ @Child private FastRContext.R contextRNode;
private void initContextRNode() {
if (contextRNode == null) {
@@ -65,7 +65,7 @@ public class ContextSystemFunctionFactory extends SystemFunctionFactory {
}
public abstract static class ContextRscriptSystemFunctionNode extends ContextSystemFunctionNode {
- @Child FastRContext.Rscript contextRscriptNode;
+ @Child private FastRContext.Rscript contextRscriptNode;
private void initContextRscriptNode() {
if (contextRscriptNode == null) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveAttributeNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveAttributeNode.java
index ae2dd9904e..8970483b7a 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveAttributeNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveAttributeNode.java
@@ -37,7 +37,7 @@ import com.oracle.truffle.r.runtime.data.RAttributeStorage;
public abstract class RemoveAttributeNode extends AttributeAccessNode {
- @Child RemoveAttributeNode recursive;
+ @Child private RemoveAttributeNode recursive;
protected RemoveAttributeNode() {
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveFixedAttributeNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveFixedAttributeNode.java
index a88a6bf261..ec325f05c1 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveFixedAttributeNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveFixedAttributeNode.java
@@ -41,7 +41,7 @@ import com.oracle.truffle.r.runtime.data.RAttributeStorage;
public abstract class RemoveFixedAttributeNode extends FixedAttributeAccessNode {
- @Child RemoveFixedAttributeNode recursive;
+ @Child private RemoveFixedAttributeNode recursive;
protected RemoveFixedAttributeNode(String name) {
super(name);
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/SetAttributeNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/SetAttributeNode.java
index dd75f36d56..cf4d64e856 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/SetAttributeNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/SetAttributeNode.java
@@ -51,7 +51,7 @@ import com.oracle.truffle.r.runtime.data.RAttributeStorage;
*/
public abstract class SetAttributeNode extends AttributeAccessNode {
- @Child SetAttributeNode recursive;
+ @Child private SetAttributeNode recursive;
protected SetAttributeNode() {
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/call/RExplicitBaseEnvCallDispatcher.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/call/RExplicitBaseEnvCallDispatcher.java
index 61d2917f3e..0fd6147435 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/call/RExplicitBaseEnvCallDispatcher.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/call/RExplicitBaseEnvCallDispatcher.java
@@ -39,8 +39,8 @@ import com.oracle.truffle.r.runtime.data.RFunction;
public abstract class RExplicitBaseEnvCallDispatcher extends Node {
@Child private LocalReadVariableNode readFunc;
- @Child RExplicitCallNode callNode = RExplicitCallNode.create();
- @Child GetBaseEnvFrameNode getBaseEnvFrameNode = GetBaseEnvFrameNode.create();
+ @Child private RExplicitCallNode callNode = RExplicitCallNode.create();
+ @Child private GetBaseEnvFrameNode getBaseEnvFrameNode = GetBaseEnvFrameNode.create();
public RExplicitBaseEnvCallDispatcher(LocalReadVariableNode readFunc) {
this.readFunc = readFunc;
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/RFactorNodes.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/RFactorNodes.java
index 686c14ef60..c20d0e9ea8 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/RFactorNodes.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/helpers/RFactorNodes.java
@@ -71,7 +71,7 @@ public final class RFactorNodes {
public static final class GetLevels extends Node {
@Child private CastStringNode castString;
@Child private GetFixedAttributeNode attrAccess = GetFixedAttributeNode.create(RRuntime.LEVELS_ATTR_KEY);
- @Child UpdateShareableChildValueNode updateAttrValue = UpdateShareableChildValueNode.create();
+ @Child private UpdateShareableChildValueNode updateAttrValue = UpdateShareableChildValueNode.create();
private final BranchProfile notVectorBranch = BranchProfile.create();
private final ConditionProfile nonScalarLevels = ConditionProfile.createBinaryProfile();
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
index 9c4a6f1dcf..3c87ec5882 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/ffi/DLL.java
@@ -633,7 +633,7 @@ public class DLL {
private static final class RFindSymbolRootNode extends RootNode {
private static RFindSymbolRootNode findSymbolRootNode;
- @Child RFindSymbolNode findSymbolNode = RFindSymbolNode.create();
+ @Child private RFindSymbolNode findSymbolNode = RFindSymbolNode.create();
private RFindSymbolRootNode() {
super(RContext.getInstance().getLanguage());
@@ -660,7 +660,7 @@ public class DLL {
}
public static final class RdlsymNode extends Node {
- @Child DLLRFFI.DLSymNode dlSymNode = RFFIFactory.getDLLRFFI().createDLSymNode();
+ @Child private DLLRFFI.DLSymNode dlSymNode = RFFIFactory.getDLLRFFI().createDLSymNode();
/**
* Directly analogous to the GnuR function {@code R_dlsym}. Checks first for a
--
GitLab