Mercurial > hg > graal-compiler
changeset 2884:adfc15cbcabc
fixed a few Node.copy methods
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatAdd.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatAdd.java Wed Jun 08 13:04:17 2011 +0200 @@ -40,7 +40,7 @@ @Override public Node copy(Graph into) { - FloatAdd x = new FloatAdd(kind, null, null, isStrictFP(), graph()); + FloatAdd x = new FloatAdd(kind, null, null, isStrictFP(), into); return x; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatDiv.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatDiv.java Wed Jun 08 13:04:17 2011 +0200 @@ -51,7 +51,7 @@ @Override public Node copy(Graph into) { - FloatDiv x = new FloatDiv(kind, null, null, isStrictFP(), graph()); + FloatDiv x = new FloatDiv(kind, null, null, isStrictFP(), into); return x; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatMul.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatMul.java Wed Jun 08 13:04:17 2011 +0200 @@ -51,7 +51,7 @@ @Override public Node copy(Graph into) { - FloatMul x = new FloatMul(kind, null, null, isStrictFP(), graph()); + FloatMul x = new FloatMul(kind, null, null, isStrictFP(), into); return x; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatRem.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatRem.java Wed Jun 08 13:04:17 2011 +0200 @@ -51,7 +51,7 @@ @Override public Node copy(Graph into) { - FloatRem x = new FloatRem(kind, null, null, isStrictFP(), graph()); + FloatRem x = new FloatRem(kind, null, null, isStrictFP(), into); return x; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatSub.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/FloatSub.java Wed Jun 08 13:04:17 2011 +0200 @@ -40,7 +40,7 @@ @Override public Node copy(Graph into) { - FloatSub x = new FloatSub(kind, null, null, isStrictFP(), graph()); + FloatSub x = new FloatSub(kind, null, null, isStrictFP(), into); return x; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerAdd.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerAdd.java Wed Jun 08 13:04:17 2011 +0200 @@ -35,7 +35,7 @@ @Override public Node copy(Graph into) { - IntegerAdd x = new IntegerAdd(kind, null, null, graph()); + IntegerAdd x = new IntegerAdd(kind, null, null, into); return x; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerDiv.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerDiv.java Wed Jun 08 13:04:17 2011 +0200 @@ -40,7 +40,7 @@ @Override public Node copy(Graph into) { - IntegerDiv x = new IntegerDiv(kind, null, null, graph()); + IntegerDiv x = new IntegerDiv(kind, null, null, into); return x; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerMul.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerMul.java Wed Jun 08 13:04:17 2011 +0200 @@ -40,7 +40,7 @@ @Override public Node copy(Graph into) { - IntegerMul x = new IntegerMul(kind, null, null, graph()); + IntegerMul x = new IntegerMul(kind, null, null, into); return x; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerRem.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerRem.java Wed Jun 08 13:04:17 2011 +0200 @@ -40,7 +40,7 @@ @Override public Node copy(Graph into) { - IntegerRem x = new IntegerRem(kind, null, null, graph()); + IntegerRem x = new IntegerRem(kind, null, null, into); return x; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerSub.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/IntegerSub.java Wed Jun 08 13:04:17 2011 +0200 @@ -35,7 +35,7 @@ @Override public Node copy(Graph into) { - IntegerSub x = new IntegerSub(kind, null, null, graph()); + IntegerSub x = new IntegerSub(kind, null, null, into); return x; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LeftShift.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LeftShift.java Wed Jun 08 13:04:17 2011 +0200 @@ -47,7 +47,7 @@ @Override public Node copy(Graph into) { - LeftShift ls = new LeftShift(kind, null, null, graph()); + LeftShift ls = new LeftShift(kind, null, null, into); return ls; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/RightShift.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/RightShift.java Wed Jun 08 13:04:17 2011 +0200 @@ -47,7 +47,7 @@ @Override public Node copy(Graph into) { - RightShift rs = new RightShift(kind, null, null, graph()); + RightShift rs = new RightShift(kind, null, null, into); return rs; }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/UnsignedRightShift.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/UnsignedRightShift.java Wed Jun 08 13:04:17 2011 +0200 @@ -47,7 +47,7 @@ @Override public Node copy(Graph into) { - UnsignedRightShift x = new UnsignedRightShift(kind, null, null, graph()); + UnsignedRightShift x = new UnsignedRightShift(kind, null, null, into); return x; }
--- a/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeArray.java Wed Jun 08 11:09:05 2011 +0200 +++ b/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeArray.java Wed Jun 08 13:04:17 2011 +0200 @@ -47,7 +47,7 @@ @Override public Node set(int index, Node node) { - assert node == Node.Null || node.graph == self().graph : "node is from different graph: (this=" + this + ") and (node=" + node + ")"; + assert node == Node.Null || node.graph == self().graph : "node is from different graph: (self=" + self() + ") and (node=" + node + ")"; assert node == Node.Null || node.id() != Node.DeletedID : "inserted node must not be deleted"; Node old = nodes[index];