From 08b2fd4df6031ffdc2567da6f2d58173af7cdab6 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Fri, 23 Feb 2018 18:06:36 +0100
Subject: [PATCH] Use TypeofNode.create() instead of TypeofNodeGen.create()
---
.../truffle/r/nodes/builtin/base/BitwiseFunctions.java | 5 ++---
.../truffle/r/nodes/builtin/base/DuplicatedFunctions.java | 7 +++----
.../com/oracle/truffle/r/nodes/builtin/base/Typeof.java | 4 ++--
.../oracle/truffle/r/nodes/builtin/base/UpdateClass.java | 5 ++---
.../truffle/r/nodes/builtin/base/UpdateStorageMode.java | 5 ++---
.../com/oracle/truffle/r/nodes/binary/CastTypeNode.java | 5 ++---
.../com/oracle/truffle/r/nodes/objects/GetS4DataSlot.java | 5 ++---
.../src/com/oracle/truffle/r/nodes/unary/IsFactorNode.java | 4 ++--
8 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BitwiseFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BitwiseFunctions.java
index 1344118dc3..59f88c3dbe 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BitwiseFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/BitwiseFunctions.java
@@ -27,7 +27,6 @@ import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.profiles.LoopConditionProfile;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.unary.TypeofNode;
-import com.oracle.truffle.r.nodes.unary.TypeofNodeGen;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RInternalError;
import com.oracle.truffle.r.runtime.RRuntime;
@@ -61,8 +60,8 @@ public class BitwiseFunctions {
private final NACheck naCheckB = NACheck.create();
private final LoopConditionProfile loopProfile = LoopConditionProfile.createCountingProfile();
- @Child private TypeofNode typeofA = TypeofNodeGen.create();
- @Child private TypeofNode typeofB = TypeofNodeGen.create();
+ @Child private TypeofNode typeofA = TypeofNode.create();
+ @Child private TypeofNode typeofB = TypeofNode.create();
protected Object basicBit(RAbstractIntVector aVec, RAbstractIntVector bVec, Operation op) {
naCheckA.enable(aVec);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DuplicatedFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DuplicatedFunctions.java
index dface54eb3..f908879ad8 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DuplicatedFunctions.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/DuplicatedFunctions.java
@@ -4,7 +4,7 @@
* http://www.gnu.org/licenses/gpl-2.0.html
*
* Copyright (c) 2014, Purdue University
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -24,7 +24,6 @@ import com.oracle.truffle.r.nodes.binary.CastTypeNode;
import com.oracle.truffle.r.nodes.binary.CastTypeNodeGen;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.unary.TypeofNode;
-import com.oracle.truffle.r.nodes.unary.TypeofNodeGen;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.RType;
@@ -80,7 +79,7 @@ public class DuplicatedFunctions {
}
protected static TypeofNode createTypeof() {
- return TypeofNodeGen.create();
+ return TypeofNode.create();
}
protected static CastTypeNode createCastType() {
@@ -138,7 +137,7 @@ public class DuplicatedFunctions {
}
protected static TypeofNode createTypeof() {
- return TypeofNodeGen.create();
+ return TypeofNode.create();
}
protected static CastTypeNode createCastType() {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Typeof.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Typeof.java
index 4a694e99a5..0393807fe6 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Typeof.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Typeof.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ import com.oracle.truffle.r.runtime.builtins.RBuiltin;
@RBuiltin(name = "typeof", kind = INTERNAL, parameterNames = {"x"}, behavior = PURE)
public abstract class Typeof extends RBuiltinNode.Arg1 {
- @Child private TypeofNode typeofNode = TypeofNodeGen.create();
+ @Child private TypeofNode typeofNode = TypeofNode.create();
static {
Casts.noCasts(Typeof.class);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateClass.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateClass.java
index 3190e1d24f..31d531ca96 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateClass.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateClass.java
@@ -4,7 +4,7 @@
* http://www.gnu.org/licenses/gpl-2.0.html
*
* Copyright (c) 2014, Purdue University
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -26,7 +26,6 @@ import com.oracle.truffle.r.nodes.binary.CastTypeNode;
import com.oracle.truffle.r.nodes.binary.CastTypeNodeGen;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.unary.TypeofNode;
-import com.oracle.truffle.r.nodes.unary.TypeofNodeGen;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RType;
import com.oracle.truffle.r.runtime.builtins.RBuiltin;
@@ -222,7 +221,7 @@ public abstract class UpdateClass extends RBuiltinNode.Arg2 {
private void initTypeof() {
if (typeof == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
- typeof = insert(TypeofNodeGen.create());
+ typeof = insert(TypeofNode.create());
}
}
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateStorageMode.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateStorageMode.java
index c33d4ddb01..94c29c7717 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateStorageMode.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateStorageMode.java
@@ -4,7 +4,7 @@
* http://www.gnu.org/licenses/gpl-2.0.html
*
* Copyright (c) 2014, Purdue University
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -28,7 +28,6 @@ import com.oracle.truffle.r.nodes.binary.CastTypeNodeGen;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.unary.IsFactorNode;
import com.oracle.truffle.r.nodes.unary.TypeofNode;
-import com.oracle.truffle.r.nodes.unary.TypeofNodeGen;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.RType;
@@ -123,7 +122,7 @@ public abstract class UpdateStorageMode extends RBuiltinNode.Arg2 {
private void initTypeOfNode() {
if (typeof == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
- typeof = insert(TypeofNodeGen.create());
+ typeof = insert(TypeofNode.create());
}
}
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/CastTypeNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/CastTypeNode.java
index 167ed9506e..dcc0f763f0 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/CastTypeNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/CastTypeNode.java
@@ -4,7 +4,7 @@
* http://www.gnu.org/licenses/gpl-2.0.html
*
* Copyright (c) 2014, Purdue University
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -28,7 +28,6 @@ import com.oracle.truffle.r.nodes.unary.CastNode;
import com.oracle.truffle.r.nodes.unary.CastRawNodeGen;
import com.oracle.truffle.r.nodes.unary.CastStringNodeGen;
import com.oracle.truffle.r.nodes.unary.TypeofNode;
-import com.oracle.truffle.r.nodes.unary.TypeofNodeGen;
import com.oracle.truffle.r.runtime.RType;
import com.oracle.truffle.r.runtime.data.RTypes;
import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@@ -41,7 +40,7 @@ public abstract class CastTypeNode extends RBaseNode {
protected static final int NUMBER_OF_TYPES = RType.values().length;
- @Child protected TypeofNode typeof = TypeofNodeGen.create();
+ @Child protected TypeofNode typeof = TypeofNode.create();
public abstract Object execute(Object value, RType type);
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/objects/GetS4DataSlot.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/objects/GetS4DataSlot.java
index 37827a9f33..82e428c1f1 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/objects/GetS4DataSlot.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/objects/GetS4DataSlot.java
@@ -6,7 +6,7 @@
* Copyright (c) 1995, 1996, 1997 Robert Gentleman and Ross Ihaka
* Copyright (c) 1995-2014, The R Core Team
* Copyright (c) 2002-2008, The R Foundation
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -21,7 +21,6 @@ import com.oracle.truffle.r.nodes.attributes.RemoveFixedAttributeNode;
import com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.SetClassAttributeNode;
import com.oracle.truffle.r.nodes.unary.CastToVectorNode;
import com.oracle.truffle.r.nodes.unary.TypeofNode;
-import com.oracle.truffle.r.nodes.unary.TypeofNodeGen;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.RType;
import com.oracle.truffle.r.runtime.data.RAttributable;
@@ -38,7 +37,7 @@ public final class GetS4DataSlot extends Node {
@Child private CastToVectorNode castToVector;
@Child private GetFixedAttributeNode dotDataAttrAccess;
@Child private GetFixedAttributeNode dotXDataAttrAccess;
- @Child private TypeofNode typeOf = TypeofNodeGen.create();
+ @Child private TypeofNode typeOf = TypeofNode.create();
@Child private SetClassAttributeNode setClassAttrNode;
private final BranchProfile shareable = BranchProfile.create();
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/IsFactorNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/IsFactorNode.java
index 2c8de03f94..857c63edb0 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/IsFactorNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/IsFactorNode.java
@@ -4,7 +4,7 @@
* http://www.gnu.org/licenses/gpl-2.0.html
*
* Copyright (c) 2014, Purdue University
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates
*
* All rights reserved.
*/
@@ -24,7 +24,7 @@ public final class IsFactorNode extends UnaryNode {
public boolean executeIsFactor(Object x) {
if (typeofNode == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
- typeofNode = insert(TypeofNodeGen.create());
+ typeofNode = insert(TypeofNode.create());
}
if (typeofNode.execute(x) != RType.Integer) {
// Note: R does not allow to set class 'factor' to an arbitrary object, unlike with
--
GitLab