Mercurial > hg > truffle

changeset 19718:d30a0545ddc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes after tryFold signature change.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 09 Mar 2015 14:18:08 +0100
parents 70d565f6e127
children 7241e6dfcafd
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatLessThanNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfNode.java
diffstat 4 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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<FloatLessThanNode> 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;
     }
 }
--- 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;
     }
 }
--- 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;
     }
 }
--- 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;
     }
 }