# HG changeset patch # User Thomas Wuerthinger # Date 1425907088 -3600 # Node ID d30a0545ddc21fb63695a08f5d53491f9942395a # Parent 70d565f6e127bf5042f9c681e8cdeb10bea8d14a Fixes after tryFold signature change. diff -r 70d565f6e127 -r d30a0545ddc2 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatLessThanNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatLessThanNode.java Mon Mar 09 14:14:02 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatLessThanNode.java Mon Mar 09 14:18:08 2015 +0100 @@ -32,8 +32,6 @@ import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.util.*; -import edu.umd.cs.findbugs.annotations.*; - @NodeInfo(shortName = "<") public final class FloatLessThanNode extends CompareNode { public static final NodeClass TYPE = NodeClass.create(FloatLessThanNode.class); @@ -86,8 +84,7 @@ } @Override - @SuppressFBWarnings(value = "NP_BOOLEAN_RETURN_NULL", justification = "null indicates no folding possible") public TriState tryFold(Stamp xStampGeneric, Stamp yStampGeneric) { - return null; + return TriState.UNKNOWN; } } diff -r 70d565f6e127 -r d30a0545ddc2 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Mon Mar 09 14:14:02 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Mon Mar 09 14:18:08 2015 +0100 @@ -182,6 +182,6 @@ return TriState.TRUE; } } - return null; + return TriState.UNKNOWN; } } diff -r 70d565f6e127 -r d30a0545ddc2 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Mon Mar 09 14:14:02 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Mon Mar 09 14:18:08 2015 +0100 @@ -72,6 +72,7 @@ @Override public TriState tryFold(Stamp xStampGeneric, Stamp yStampGeneric) { + System.out.println("try fold with " + xStampGeneric + " and " + yStampGeneric); return TriState.UNKNOWN; } } diff -r 70d565f6e127 -r d30a0545ddc2 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Mon Mar 09 14:14:02 2015 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java Mon Mar 09 14:18:08 2015 +0100 @@ -197,6 +197,6 @@ } } } - return null; + return TriState.UNKNOWN; } }