diff graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java @ 16156:0993768dfc8e

new UnaryNode base class
author Lukas Stadler <lukas.stadler@oracle.com>
date Mon, 23 Jun 2014 14:11:54 +0200
parents 73a0c8e14cd1
children b3945bb0016f
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java	Fri Jun 20 12:09:46 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java	Mon Jun 23 14:11:54 2014 +0200
@@ -115,8 +115,8 @@
         } else if (x() instanceof ConvertNode && y() instanceof ConvertNode) {
             ConvertNode convertX = (ConvertNode) x();
             ConvertNode convertY = (ConvertNode) y();
-            if (convertX.preservesOrder(condition()) && convertY.preservesOrder(condition()) && convertX.getInput().stamp().isCompatible(convertY.getInput().stamp())) {
-                return graph().unique(duplicateModified(convertX.getInput(), convertY.getInput()));
+            if (convertX.preservesOrder(condition()) && convertY.preservesOrder(condition()) && convertX.getValue().stamp().isCompatible(convertY.getValue().stamp())) {
+                return graph().unique(duplicateModified(convertX.getValue(), convertY.getValue()));
             }
 
         }
@@ -137,9 +137,9 @@
             ConstantNode newConstant = canonicalConvertConstant(tool, convert, constant);
             if (newConstant != null) {
                 if (mirrored) {
-                    return graph().unique(duplicateModified(newConstant, convert.getInput()));
+                    return graph().unique(duplicateModified(newConstant, convert.getValue()));
                 } else {
-                    return graph().unique(duplicateModified(convert.getInput(), newConstant));
+                    return graph().unique(duplicateModified(convert.getValue(), newConstant));
                 }
             }
         }
@@ -150,7 +150,7 @@
         if (convert.preservesOrder(condition())) {
             Constant reverseConverted = convert.reverse(constant);
             if (convert.convert(reverseConverted).equals(constant)) {
-                return ConstantNode.forConstant(convert.getInput().stamp(), reverseConverted, tool.getMetaAccess(), convert.graph());
+                return ConstantNode.forConstant(convert.getValue().stamp(), reverseConverted, tool.getMetaAccess(), convert.graph());
             }
         }
         return null;