From 5d9110c36c559bb647e907c38dd89c16f84fd71c Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Fri, 6 May 2016 14:32:07 +0200
Subject: [PATCH] various small fixes (imports, unused fields)
---
.../src/com/oracle/truffle/r/nodes/RASTBuilder.java | 5 -----
.../truffle/r/nodes/function/WrapArgumentBaseNode.java | 3 ---
.../src/com/oracle/truffle/r/nodes/helpers/RFactorNodes.java | 1 -
3 files changed, 9 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RASTBuilder.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RASTBuilder.java
index da6c3c3242..a6180e8412 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RASTBuilder.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/RASTBuilder.java
@@ -56,12 +56,7 @@ import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RInternalError;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.data.FastPathFactory;
-import com.oracle.truffle.r.runtime.data.RComplex;
import com.oracle.truffle.r.runtime.data.REmpty;
-import com.oracle.truffle.r.runtime.data.RFunction;
-import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RSymbol;
-import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
import com.oracle.truffle.r.runtime.env.frame.FrameSlotChangeMonitor;
import com.oracle.truffle.r.runtime.nodes.RCodeBuilder;
import com.oracle.truffle.r.runtime.nodes.RNode;
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/WrapArgumentBaseNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/WrapArgumentBaseNode.java
index 5210945655..b54a2b7daf 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/WrapArgumentBaseNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/WrapArgumentBaseNode.java
@@ -39,7 +39,6 @@ public abstract class WrapArgumentBaseNode extends RNode {
@Child protected RNode operand;
private final BranchProfile everSeenVector;
- private final BranchProfile everSeenFactor;
private final BranchProfile everSeenLanguage;
private final BranchProfile everSeenFunction;
private final BranchProfile everSeenS4Object;
@@ -51,7 +50,6 @@ public abstract class WrapArgumentBaseNode extends RNode {
this.operand = operand;
if (initProfiles) {
everSeenVector = BranchProfile.create();
- everSeenFactor = BranchProfile.create();
everSeenLanguage = BranchProfile.create();
everSeenFunction = BranchProfile.create();
everSeenS4Object = BranchProfile.create();
@@ -59,7 +57,6 @@ public abstract class WrapArgumentBaseNode extends RNode {
nonShareable = BranchProfile.create();
} else {
everSeenVector = null;
- everSeenFactor = null;
everSeenLanguage = null;
everSeenFunction = null;
everSeenS4Object = null;
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 8c901661b6..01dddaea70 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,6 @@ public final class RFactorNodes {
@Child private CastStringNode castString;
@Child private AttributeAccess attrAccess = AttributeAccess.create(RRuntime.LEVELS_ATTR_KEY);
- private final RAttributeProfiles attrProfiles = RAttributeProfiles.create();
private final BranchProfile notVectorBranch = BranchProfile.create();
private final ConditionProfile nonScalarLevels = ConditionProfile.createBinaryProfile();
private final ConditionProfile stringVectorLevels = ConditionProfile.createBinaryProfile();
--
GitLab