From a40ea846ccc0ad3061b18947752e3d61d1bed087 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Fri, 10 Aug 2018 22:35:30 +0200
Subject: [PATCH] Remove naProfile field in CastDoubleBaseNode and use it only
as @Cached
---
.../com/oracle/truffle/r/nodes/unary/CastDoubleBaseNode.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastDoubleBaseNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastDoubleBaseNode.java
index b98cb221e2..dee35f5efb 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastDoubleBaseNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastDoubleBaseNode.java
@@ -40,7 +40,6 @@ import com.oracle.truffle.r.runtime.ops.na.NAProfile;
public abstract class CastDoubleBaseNode extends CastBaseNode {
protected final NACheck naCheck = NACheck.create();
- protected final NAProfile naProfile = NAProfile.create();
protected CastDoubleBaseNode(boolean preserveNames, boolean preserveDimensions, boolean preserveAttributes) {
super(preserveNames, preserveDimensions, preserveAttributes);
@@ -110,7 +109,8 @@ public abstract class CastDoubleBaseNode extends CastBaseNode {
@Specialization
protected double doString(String operand,
- @Cached("createBinaryProfile()") ConditionProfile emptyStringProfile) {
+ @Cached("createBinaryProfile()") ConditionProfile emptyStringProfile,
+ @Cached("create()") NAProfile naProfile) {
if (naProfile.isNA(operand) || emptyStringProfile.profile(operand.isEmpty())) {
return RRuntime.DOUBLE_NA;
}
--
GitLab