diff graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java @ 16207:df6f2365b153

rename of x() to getX(), y() to getY() and object() to getValue()
author Lukas Stadler <lukas.stadler@oracle.com>
date Wed, 25 Jun 2014 11:20:53 +0200
parents 3a6dffce5158
children b558af6ff4bc
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java	Wed Jun 25 11:20:50 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java	Wed Jun 25 11:20:53 2014 +0200
@@ -40,7 +40,7 @@
 
     @Override
     public boolean inferStamp() {
-        return updateStamp(StampTool.or(x().stamp(), y().stamp()));
+        return updateStamp(StampTool.or(getX().stamp(), getY().stamp()));
     }
 
     @Override
@@ -51,22 +51,22 @@
 
     @Override
     public Node canonical(CanonicalizerTool tool) {
-        if (x() == y()) {
-            return x();
+        if (getX() == getY()) {
+            return getX();
         }
-        if (x().isConstant() && !y().isConstant()) {
-            return graph().unique(new OrNode(stamp(), y(), x()));
+        if (getX().isConstant() && !getY().isConstant()) {
+            return graph().unique(new OrNode(stamp(), getY(), getX()));
         }
-        if (x().isConstant()) {
-            return ConstantNode.forPrimitive(stamp(), evalConst(x().asConstant(), y().asConstant()), graph());
-        } else if (y().isConstant()) {
-            long rawY = y().asConstant().asLong();
+        if (getX().isConstant()) {
+            return ConstantNode.forPrimitive(stamp(), evalConst(getX().asConstant(), getY().asConstant()), graph());
+        } else if (getY().isConstant()) {
+            long rawY = getY().asConstant().asLong();
             long mask = IntegerStamp.defaultMask(PrimitiveStamp.getBits(stamp()));
             if ((rawY & mask) == mask) {
                 return ConstantNode.forIntegerStamp(stamp(), mask, graph());
             }
             if ((rawY & mask) == 0) {
-                return x();
+                return getX();
             }
             return BinaryNode.reassociate(this, ValueNode.isConstantPredicate());
         }
@@ -75,6 +75,6 @@
 
     @Override
     public void generate(NodeMappableLIRBuilder builder, ArithmeticLIRGenerator gen) {
-        builder.setResult(this, gen.emitOr(builder.operand(x()), builder.operand(y())));
+        builder.setResult(this, gen.emitOr(builder.operand(getX()), builder.operand(getY())));
     }
 }