# HG changeset patch
# User Chris Seaton <chris.seaton@oracle.com>
# Date 1380721590 -3600
# Node ID 44257a9160f17aed1ac2bd76fea883c01bfa888d
# Parent  952ecf32788afb555d484b5b9e220f359ab92a66# Parent  ee88780346a4eb11944a54d53c1cd659a49ad586
Merge.

diff -r 952ecf32788a -r 44257a9160f1 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java	Wed Oct 02 14:19:28 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java	Wed Oct 02 14:46:30 2013 +0100
@@ -37,10 +37,10 @@
     public Constant evalConst(Constant... inputs) {
         assert inputs.length == 2;
         if (kind() == Kind.Float) {
-            return Constant.forFloat(x().asConstant().asFloat() + y().asConstant().asFloat());
+            return Constant.forFloat(inputs[0].asFloat() + inputs[1].asFloat());
         } else {
             assert kind() == Kind.Double;
-            return Constant.forDouble(x().asConstant().asDouble() + y().asConstant().asDouble());
+            return Constant.forDouble(inputs[0].asDouble() + inputs[1].asDouble());
         }
     }
 
diff -r 952ecf32788a -r 44257a9160f1 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java	Wed Oct 02 14:19:28 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java	Wed Oct 02 14:46:30 2013 +0100
@@ -37,10 +37,10 @@
     public Constant evalConst(Constant... inputs) {
         assert inputs.length == 2;
         if (kind() == Kind.Float) {
-            return Constant.forFloat(x().asConstant().asFloat() / y().asConstant().asFloat());
+            return Constant.forFloat(inputs[0].asFloat() / inputs[1].asFloat());
         } else {
             assert kind() == Kind.Double;
-            return Constant.forDouble(x().asConstant().asDouble() / y().asConstant().asDouble());
+            return Constant.forDouble(inputs[0].asDouble() / inputs[1].asDouble());
         }
     }
 
diff -r 952ecf32788a -r 44257a9160f1 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java	Wed Oct 02 14:19:28 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java	Wed Oct 02 14:46:30 2013 +0100
@@ -37,10 +37,10 @@
     public Constant evalConst(Constant... inputs) {
         assert inputs.length == 2;
         if (kind() == Kind.Float) {
-            return Constant.forFloat(x().asConstant().asFloat() * y().asConstant().asFloat());
+            return Constant.forFloat(inputs[0].asFloat() * inputs[1].asFloat());
         } else {
             assert kind() == Kind.Double;
-            return Constant.forDouble(x().asConstant().asDouble() * y().asConstant().asDouble());
+            return Constant.forDouble(inputs[0].asDouble() * inputs[1].asDouble());
         }
     }
 
diff -r 952ecf32788a -r 44257a9160f1 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java	Wed Oct 02 14:19:28 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java	Wed Oct 02 14:46:30 2013 +0100
@@ -37,10 +37,10 @@
     public Constant evalConst(Constant... inputs) {
         assert inputs.length == 2;
         if (kind() == Kind.Float) {
-            return Constant.forFloat(x().asConstant().asFloat() % y().asConstant().asFloat());
+            return Constant.forFloat(inputs[0].asFloat() % inputs[1].asFloat());
         } else {
             assert kind() == Kind.Double;
-            return Constant.forDouble(x().asConstant().asDouble() % y().asConstant().asDouble());
+            return Constant.forDouble(inputs[0].asDouble() % inputs[1].asDouble());
         }
     }
 
diff -r 952ecf32788a -r 44257a9160f1 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java	Wed Oct 02 14:19:28 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java	Wed Oct 02 14:46:30 2013 +0100
@@ -37,10 +37,10 @@
     public Constant evalConst(Constant... inputs) {
         assert inputs.length == 2;
         if (kind() == Kind.Float) {
-            return Constant.forFloat(x().asConstant().asFloat() - y().asConstant().asFloat());
+            return Constant.forFloat(inputs[0].asFloat() - inputs[1].asFloat());
         } else {
             assert kind() == Kind.Double;
-            return Constant.forDouble(x().asConstant().asDouble() - y().asConstant().asDouble());
+            return Constant.forDouble(inputs[0].asDouble() - inputs[1].asDouble());
         }
     }