From 7eb2ae08d1829798578c6aeb744e61e0b8cc2124 Mon Sep 17 00:00:00 2001
From: Miloslav Metelka <miloslav.metelka@oracle.com>
Date: Mon, 7 Aug 2017 16:57:13 +0200
Subject: [PATCH] Fixed max() on empty int vector.
---
.../truffle/r/nodes/builtin/base/Max.java | 2 +-
.../truffle/r/nodes/builtin/base/Min.java | 2 +-
.../truffle/r/nodes/builtin/base/PMinMax.java | 4 +-
.../truffle/r/nodes/builtin/base/Range.java | 4 +-
.../truffle/r/nodes/builtin/base/Sum.java | 2 +-
.../unary/UnaryArithmeticReduceNode.java | 38 ++++++++++++++++---
.../truffle/r/test/ExpectedTestOutput.test | 16 +++++++-
.../r/test/builtins/TestBuiltin_max.java | 8 ++--
8 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Max.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Max.java
index 34cc91da91..ce41444d9e 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Max.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Max.java
@@ -43,7 +43,7 @@ import com.oracle.truffle.r.runtime.ops.BinaryArithmetic;
public abstract class Max extends RBuiltinNode.Arg2 {
private static final ReduceSemantics semantics = new ReduceSemantics(RRuntime.INT_MIN_VALUE, Double.NEGATIVE_INFINITY, false, RError.Message.NO_NONMISSING_MAX,
- RError.Message.NO_NONMISSING_MAX_NA, false, true);
+ RError.Message.NO_NONMISSING_MAX_NA, null, false, true, true);
@Child private UnaryArithmeticReduceNode reduce = UnaryArithmeticReduceNodeGen.create(semantics, BinaryArithmetic.MAX);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Min.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Min.java
index ca072450b4..7be389e2d1 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Min.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Min.java
@@ -43,7 +43,7 @@ import com.oracle.truffle.r.runtime.ops.BinaryArithmetic;
public abstract class Min extends RBuiltinNode.Arg2 {
private static final ReduceSemantics semantics = new ReduceSemantics(RRuntime.INT_MAX_VALUE, Double.POSITIVE_INFINITY, false, RError.Message.NO_NONMISSING_MIN,
- RError.Message.NO_NONMISSING_MIN_NA, false, true);
+ RError.Message.NO_NONMISSING_MIN_NA, null, false, true, true);
@Child private UnaryArithmeticReduceNode reduce = UnaryArithmeticReduceNodeGen.create(semantics, BinaryArithmetic.MIN);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PMinMax.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PMinMax.java
index 6350ec5ad7..4dd253311b 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PMinMax.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/PMinMax.java
@@ -341,7 +341,7 @@ public abstract class PMinMax extends RBuiltinNode.Arg2 {
public abstract static class PMax extends PMinMax {
public PMax() {
- super(new ReduceSemantics(RRuntime.INT_MIN_VALUE, Double.NEGATIVE_INFINITY, false, RError.Message.NO_NONMISSING_MAX, RError.Message.NO_NONMISSING_MAX_NA, false, true),
+ super(new ReduceSemantics(RRuntime.INT_MIN_VALUE, Double.NEGATIVE_INFINITY, false, RError.Message.NO_NONMISSING_MAX, RError.Message.NO_NONMISSING_MAX_NA, null, false, true, true),
BinaryArithmetic.MAX);
}
@@ -354,7 +354,7 @@ public abstract class PMinMax extends RBuiltinNode.Arg2 {
public abstract static class PMin extends PMinMax {
public PMin() {
- super(new ReduceSemantics(RRuntime.INT_MAX_VALUE, Double.POSITIVE_INFINITY, false, RError.Message.NO_NONMISSING_MIN, RError.Message.NO_NONMISSING_MIN_NA, false, true),
+ super(new ReduceSemantics(RRuntime.INT_MAX_VALUE, Double.POSITIVE_INFINITY, false, RError.Message.NO_NONMISSING_MIN, RError.Message.NO_NONMISSING_MIN_NA, null, false, true, true),
BinaryArithmetic.MIN);
}
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Range.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Range.java
index 828b494e5f..9395c6682c 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Range.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Range.java
@@ -45,9 +45,9 @@ import com.oracle.truffle.r.runtime.ops.BinaryArithmetic;
public abstract class Range extends RBuiltinNode.Arg3 {
private static final ReduceSemantics minSemantics = new ReduceSemantics(RRuntime.INT_MAX_VALUE, Double.POSITIVE_INFINITY, false, RError.Message.NO_NONMISSING_MIN,
- RError.Message.NO_NONMISSING_MIN_NA, false, true);
+ RError.Message.NO_NONMISSING_MIN_NA, null, false, true, true);
private static final ReduceSemantics maxSemantics = new ReduceSemantics(RRuntime.INT_MIN_VALUE, Double.NEGATIVE_INFINITY, false, RError.Message.NO_NONMISSING_MAX,
- RError.Message.NO_NONMISSING_MAX_NA, false, true);
+ RError.Message.NO_NONMISSING_MAX_NA, null, false, true, true);
@Child private UnaryArithmeticReduceNode minReduce = UnaryArithmeticReduceNodeGen.create(minSemantics, BinaryArithmetic.MIN);
@Child private UnaryArithmeticReduceNode maxReduce = UnaryArithmeticReduceNodeGen.create(maxSemantics, BinaryArithmetic.MAX);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Sum.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Sum.java
index a370cef06f..00fbadeb93 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Sum.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Sum.java
@@ -54,7 +54,7 @@ public abstract class Sum extends RBuiltinNode.Arg2 {
protected static final boolean FULL_PRECISION = FastROptions.FullPrecisionSum.getBooleanValue();
- private static final ReduceSemantics semantics = new ReduceSemantics(0, 0.0, true, null, null, Message.INTEGER_OVERFLOW_USE_SUM_NUMERIC, true, false);
+ private static final ReduceSemantics semantics = new ReduceSemantics(0, 0.0, true, null, null, Message.INTEGER_OVERFLOW_USE_SUM_NUMERIC, true, false, false);
@Child private UnaryArithmeticReduceNode reduce = UnaryArithmeticReduceNodeGen.create(semantics, BinaryArithmetic.ADD);
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/UnaryArithmeticReduceNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/UnaryArithmeticReduceNode.java
index f54f392a94..0a6de6adf1 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/UnaryArithmeticReduceNode.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/UnaryArithmeticReduceNode.java
@@ -72,6 +72,7 @@ public abstract class UnaryArithmeticReduceNode extends RBaseNode {
protected final ReduceSemantics semantics;
protected final boolean supportString;
protected final boolean supportComplex;
+ protected final boolean useDoubleStartForEmptyVector;
private final NACheck na = NACheck.create();
private final ConditionProfile naRmProfile = ConditionProfile.createBinaryProfile();
@@ -82,6 +83,7 @@ public abstract class UnaryArithmeticReduceNode extends RBaseNode {
this.arithmetic = factory.createOperation();
this.supportString = semantics.supportString;
this.supportComplex = semantics.supportComplex;
+ this.useDoubleStartForEmptyVector = semantics.useDoubleStartForEmptyVector;
}
private String handleString(RStringVector operand, boolean naRm, boolean finite, int offset) {
@@ -200,6 +202,14 @@ public abstract class UnaryArithmeticReduceNode extends RBaseNode {
}
}
+ @Specialization(guards = {"useDoubleStartForEmptyVector", "operand.getLength() == 0"})
+ protected double doIntVectorEmpty(@SuppressWarnings("unused") RIntVector operand,
+ @SuppressWarnings("unused") boolean naRm,
+ @SuppressWarnings("unused") boolean finite) {
+ emptyWarning();
+ return semantics.getDoubleStart();
+ }
+
@Specialization
protected int doIntVector(RIntVector operand, boolean naRm, boolean finite) {
RBaseNode.reportWork(this, operand.getLength());
@@ -267,6 +277,14 @@ public abstract class UnaryArithmeticReduceNode extends RBaseNode {
return result;
}
+ @Specialization(guards = {"useDoubleStartForEmptyVector", "operand.getLength() == 0"})
+ protected double doLogicalVectorEmpty(@SuppressWarnings("unused") RLogicalVector operand,
+ @SuppressWarnings("unused") boolean naRm,
+ @SuppressWarnings("unused") boolean finite) {
+ emptyWarning();
+ return semantics.getDoubleStart();
+ }
+
@Specialization
protected int doLogicalVector(RLogicalVector operand, boolean naRm, @SuppressWarnings("unused") boolean finite) {
RBaseNode.reportWork(this, operand.getLength());
@@ -298,6 +316,14 @@ public abstract class UnaryArithmeticReduceNode extends RBaseNode {
return result;
}
+ @Specialization(guards = {"useDoubleStartForEmptyVector", "operand.getLength() == 0"})
+ protected double doIntSequenceEmpty(@SuppressWarnings("unused") RIntSequence operand,
+ @SuppressWarnings("unused") boolean naRm,
+ @SuppressWarnings("unused") boolean finite) {
+ emptyWarning();
+ return semantics.getDoubleStart();
+ }
+
@Specialization
protected int doIntSequence(RIntSequence operand, @SuppressWarnings("unused") boolean naRm, @SuppressWarnings("unused") boolean finite) {
RBaseNode.reportWork(this, operand.getLength());
@@ -421,9 +447,10 @@ public abstract class UnaryArithmeticReduceNode extends RBaseNode {
private final RError.Message naResultWarning;
private final boolean supportComplex;
private final boolean supportString;
+ private final boolean useDoubleStartForEmptyVector;
public ReduceSemantics(int intStart, double doubleStart, boolean nullInt, RError.Message emptyWarning, RError.Message emptyWarningCharacter, RError.Message naResultWarning,
- boolean supportComplex, boolean supportString) {
+ boolean supportComplex, boolean supportString, boolean useDoubleStartForEmptyVector) {
this.intStart = intStart;
this.doubleStart = doubleStart;
this.nullInt = nullInt;
@@ -432,10 +459,7 @@ public abstract class UnaryArithmeticReduceNode extends RBaseNode {
this.naResultWarning = naResultWarning;
this.supportComplex = supportComplex;
this.supportString = supportString;
- }
-
- public ReduceSemantics(int intStart, double doubleStart, boolean nullInt, RError.Message emptyWarning, RError.Message emptyWarningCharacter, boolean supportComplex, boolean supportString) {
- this(intStart, doubleStart, nullInt, emptyWarning, emptyWarningCharacter, null, supportComplex, supportString);
+ this.useDoubleStartForEmptyVector = useDoubleStartForEmptyVector;
}
public int getIntStart() {
@@ -465,6 +489,10 @@ public abstract class UnaryArithmeticReduceNode extends RBaseNode {
public RError.Message getNAResultWarning() {
return naResultWarning;
}
+
+ public boolean isUseDoubleStartForEmptyVector() {
+ return useDoubleStartForEmptyVector;
+ }
}
private static final class MultiElemStringHandlerNode extends RBaseNode {
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
index 2ef82b8378..d3334b70c5 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
@@ -36185,18 +36185,30 @@ In max(double()) : no non-missing arguments to max; returning -Inf
Warning message:
In max(double(0)) : no non-missing arguments to max; returning -Inf
-##com.oracle.truffle.r.test.builtins.TestBuiltin_max.testMaximum#Ignored.ImplementationError#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_max.testMaximum#
#{ max(integer()) }
[1] -Inf
Warning message:
In max(integer()) : no non-missing arguments to max; returning -Inf
-##com.oracle.truffle.r.test.builtins.TestBuiltin_max.testMaximum#Ignored.ImplementationError#
+##com.oracle.truffle.r.test.builtins.TestBuiltin_max.testMaximum#
#{ max(integer(0)) }
[1] -Inf
Warning message:
In max(integer(0)) : no non-missing arguments to max; returning -Inf
+##com.oracle.truffle.r.test.builtins.TestBuiltin_max.testMaximum#
+#{ max(logical(0)) }
+[1] -Inf
+Warning message:
+In max(logical(0)) : no non-missing arguments to max; returning -Inf
+
+##com.oracle.truffle.r.test.builtins.TestBuiltin_max.testMaximum#
+#{ max(seq_len(0)) }
+[1] -Inf
+Warning message:
+In max(seq_len(0)) : no non-missing arguments to max; returning -Inf
+
##com.oracle.truffle.r.test.builtins.TestBuiltin_max.testmax1#
#argv <- list(10L, 1L);max(argv[[1]],argv[[2]]);
[1] 10
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_max.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_max.java
index f8cf0fa929..a06988258f 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_max.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_max.java
@@ -214,15 +214,15 @@ public class TestBuiltin_max extends TestBase {
assertEval("max(v<-42)");
- // FIXME -2147483647 returned instead of -Inf
- assertEval(Ignored.ImplementationError, "{ max(integer(0)) }");
- // FIXME -2147483647 returned instead of -Inf
- assertEval(Ignored.ImplementationError, "{ max(integer()) }");
+ assertEval("{ max(integer(0)) }");
+ assertEval("{ max(integer()) }");
assertEval("{ max(as.double(NA), na.rm=TRUE) }");
// FIXME -2147483647 returned instead of -Inf
assertEval(Ignored.ImplementationError, "{ max(as.integer(NA), na.rm=TRUE) }");
// FIXME -2147483647 returned instead of -Inf
assertEval(Ignored.ImplementationError, "{ max(as.integer(NA), as.integer(NA), na.rm=TRUE) }");
+ assertEval("{ max(logical(0)) }");
+ assertEval("{ max(seq_len(0)) }");
assertEval("max(c(1,NA,2), na.rm=NA)");
}
--
GitLab