Skip to content
Snippets Groups Projects
Commit f73ae0b6 authored by Lukas Stadler's avatar Lukas Stadler
Browse files

[GR-2738] Do not use “null” source sections.

parents a2ba7747 1b75ff19
No related branches found
No related tags found
No related merge requests found
Showing with 18 additions and 11 deletions
......@@ -59,6 +59,7 @@ import com.oracle.truffle.r.runtime.data.RTypedValue;
import com.oracle.truffle.r.runtime.env.RScope;
import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
import com.oracle.truffle.r.runtime.nodes.RBaseNode;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
/**
* Only does the minimum for running under the debugger. It is not completely clear how to correctly
......@@ -203,7 +204,7 @@ public final class TruffleRLanguage extends TruffleLanguage<RContext> implements
} catch (IncompleteSourceException e) {
throw new com.oracle.truffle.api.vm.IncompleteSourceException(e);
} catch (ParseException e) {
return Truffle.getRuntime().createCallTarget(new RootNode(TruffleRLanguage.class, null, new FrameDescriptor()) {
return Truffle.getRuntime().createCallTarget(new RootNode(TruffleRLanguage.class, RSyntaxNode.INTERNAL, new FrameDescriptor()) {
@Override
public Object execute(VirtualFrame frame) {
try {
......
......@@ -42,6 +42,7 @@ import com.oracle.truffle.r.runtime.context.RContext;
import com.oracle.truffle.r.runtime.context.RContext.RCloseable;
import com.oracle.truffle.r.runtime.data.RLogical;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
public final class RAbstractVectorAccessFactory implements Factory26 {
......@@ -51,7 +52,7 @@ public final class RAbstractVectorAccessFactory implements Factory26 {
@SuppressWarnings("deprecation")
VectorSizeNode() {
super(TruffleRLanguage.class, null, null);
super(TruffleRLanguage.class, RSyntaxNode.INTERNAL, null);
}
@Override
......@@ -69,7 +70,7 @@ public final class RAbstractVectorAccessFactory implements Factory26 {
@SuppressWarnings("deprecation")
VectorReadNode() {
super(TruffleRLanguage.class, null, null);
super(TruffleRLanguage.class, RSyntaxNode.INTERNAL, null);
this.lengthAccess = false;
}
......@@ -99,7 +100,7 @@ public final class RAbstractVectorAccessFactory implements Factory26 {
private abstract class InteropRootNode extends RootNode {
@SuppressWarnings("deprecation")
InteropRootNode() {
super(TruffleRLanguage.class, null, null);
super(TruffleRLanguage.class, RSyntaxNode.INTERNAL, null);
}
}
......
......@@ -41,6 +41,7 @@ import com.oracle.truffle.r.ffi.impl.nodes.MiscNodesFactory.RDoSlotAssignNodeGen
import com.oracle.truffle.r.ffi.impl.nodes.MiscNodesFactory.RDoSlotNodeGen;
import com.oracle.truffle.r.runtime.RInternalError;
import com.oracle.truffle.r.runtime.context.RContext;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
public final class FFIUpCallRootNode extends RootNode {
private static final RootCallTarget[] rootCallTargets = new RootCallTarget[RFFIUpCallTable.values().length];
......@@ -50,7 +51,7 @@ public final class FFIUpCallRootNode extends RootNode {
@SuppressWarnings("deprecation")
private FFIUpCallRootNode(FFIUpCallNode child) {
super(RContext.getRRuntimeASTAccess().getTruffleRLanguage(), null, new FrameDescriptor());
super(RContext.getRRuntimeASTAccess().getTruffleRLanguage(), RSyntaxNode.INTERNAL, new FrameDescriptor());
theFFIUpCallNode = child;
this.numArgs = child.numArgs();
}
......
......@@ -74,6 +74,7 @@ import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
import com.oracle.truffle.r.runtime.nodes.RBaseNode;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
public final class ValuePrinterNode extends RBaseNode {
......@@ -563,7 +564,7 @@ public final class ValuePrinterNode extends RBaseNode {
@SuppressWarnings("deprecation")
public static String prettyPrint(final Object value) {
return (String) Truffle.getRuntime().createCallTarget(new RootNode(TruffleLanguage.class, null, null) {
return (String) Truffle.getRuntime().createCallTarget(new RootNode(TruffleLanguage.class, RSyntaxNode.INTERNAL, null) {
@Child ValuePrinterNode valuePrinterNode = new ValuePrinterNode();
......
......@@ -42,6 +42,7 @@ import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.data.model.RAbstractDoubleVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
public class TestUtilities {
......@@ -211,7 +212,7 @@ public class TestUtilities {
@SuppressWarnings("deprecation")
TestRoot(T node, NodeAdapter<T> invoke) {
super(TruffleLanguage.class, null, null);
super(TruffleLanguage.class, RSyntaxNode.INTERNAL, null);
this.node = node;
this.invoke = invoke;
}
......
......@@ -40,6 +40,7 @@ import com.oracle.truffle.r.runtime.data.RStringVector;
import com.oracle.truffle.r.runtime.data.RSymbol;
import com.oracle.truffle.r.runtime.data.RTruffleObject;
import com.oracle.truffle.r.runtime.ffi.CallRFFI.InvokeVoidCallNode;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
import com.oracle.truffle.r.runtime.rng.user.UserRNG;
/**
......@@ -616,7 +617,7 @@ public class DLL {
@SuppressWarnings("deprecation")
private RFindSymbolRootNode() {
super(RContext.getRRuntimeASTAccess().getTruffleRLanguage(), null, new FrameDescriptor());
super(RContext.getRRuntimeASTAccess().getTruffleRLanguage(), RSyntaxNode.INTERNAL, new FrameDescriptor());
}
@Override
......
......@@ -27,15 +27,15 @@ import com.oracle.truffle.api.frame.FrameDescriptor;
import com.oracle.truffle.api.nodes.RootNode;
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.r.runtime.context.RContext;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
public abstract class RFFIRootNode<T extends Node> extends RootNode {
@Child protected T rffiNode;
@SuppressWarnings("deprecation")
protected RFFIRootNode(T baseRFFINode) {
super(RContext.getRRuntimeASTAccess().getTruffleRLanguage(), null, new FrameDescriptor());
super(RContext.getRRuntimeASTAccess().getTruffleRLanguage(), RSyntaxNode.INTERNAL, new FrameDescriptor());
this.rffiNode = baseRFFINode;
Truffle.getRuntime().createCallTarget(this);
}
}
......@@ -34,6 +34,7 @@ import com.oracle.truffle.r.runtime.context.RContext;
import com.oracle.truffle.r.runtime.data.RNull;
import com.oracle.truffle.r.runtime.ffi.DLL;
import com.oracle.truffle.r.runtime.ffi.DLL.DLLInfo;
import com.oracle.truffle.r.runtime.nodes.RSyntaxNode;
import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
import com.oracle.truffle.r.runtime.ffi.UserRngRFFI;
import com.oracle.truffle.r.runtime.rng.RRNG.Kind;
......@@ -80,7 +81,7 @@ public final class UserRNG implements RandomNumberGenerator {
@SuppressWarnings("deprecation")
protected UserRNGRootNodeAdapter() {
super(RContext.getRRuntimeASTAccess().getTruffleRLanguage(), null, new FrameDescriptor());
super(RContext.getRRuntimeASTAccess().getTruffleRLanguage(), RSyntaxNode.INTERNAL, new FrameDescriptor());
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment