# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1383563857 -3600
# Node ID 55b23f75d3b0a584a233ed182a964ab86ea0748e
# Parent  ef6745a4597a3049f998f5edf1a860c062814ec7
Add graph parameter to ConvertNode smart constructor.

diff -r ef6745a4597a -r 55b23f75d3b0 graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedOffsetInductionVariable.java
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedOffsetInductionVariable.java	Mon Nov 04 11:40:33 2013 +0100
+++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedOffsetInductionVariable.java	Mon Nov 04 12:17:37 2013 +0100
@@ -93,7 +93,7 @@
 
     @Override
     public ValueNode extremumNode(boolean assumePositiveTripCount, Kind kind) {
-        return op(base.extremumNode(assumePositiveTripCount, kind), ConvertNode.convert(kind, offset));
+        return op(base.extremumNode(assumePositiveTripCount, kind), ConvertNode.convert(graph(), kind, offset));
     }
 
     @Override
diff -r ef6745a4597a -r 55b23f75d3b0 graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedScaledInductionVariable.java
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedScaledInductionVariable.java	Mon Nov 04 11:40:33 2013 +0100
+++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/DerivedScaledInductionVariable.java	Mon Nov 04 12:17:37 2013 +0100
@@ -103,7 +103,7 @@
 
     @Override
     public ValueNode extremumNode(boolean assumePositiveTripCount, Kind kind) {
-        return IntegerArithmeticNode.mul(graph(), base.extremumNode(assumePositiveTripCount, kind), ConvertNode.convert(kind, scale));
+        return IntegerArithmeticNode.mul(graph(), base.extremumNode(assumePositiveTripCount, kind), ConvertNode.convert(graph(), kind, scale));
     }
 
     @Override
diff -r ef6745a4597a -r 55b23f75d3b0 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java	Mon Nov 04 11:40:33 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java	Mon Nov 04 12:17:37 2013 +0100
@@ -274,11 +274,11 @@
         gen.setResult(this, gen.emitConvert(from, to, gen.operand(value())));
     }
 
-    public static ValueNode convert(Kind toKind, ValueNode value) {
+    public static ValueNode convert(StructuredGraph graph, Kind toKind, ValueNode value) {
         Kind fromKind = value.kind();
         if (fromKind == toKind) {
             return value;
         }
-        return value.graph().unique(new ConvertNode(fromKind, toKind, value));
+        return graph.unique(new ConvertNode(fromKind, toKind, value));
     }
 }