# HG changeset patch # User Gilles Duboscq # Date 1304068566 -7200 # Node ID 46eab5817cc22c96e9024a84ac610495fdccfa11 # Parent 98eef19a381c4eaaa034884d246fdd1022fee1ba Modified assert in NodeArray.set method (also helps with a compilation issue in ECJ) diff -r 98eef19a381c -r 46eab5817cc2 graal/GraalGraph/src/com/oracle/graal/graph/Node.java --- a/graal/GraalGraph/src/com/oracle/graal/graph/Node.java Thu Apr 28 18:58:35 2011 +0200 +++ b/graal/GraalGraph/src/com/oracle/graal/graph/Node.java Fri Apr 29 11:16:06 2011 +0200 @@ -139,6 +139,11 @@ return 0; } + @Override + public String toString() { + return this.getClass().getSimpleName() + "-" + this.id(); + } + public class NodeArray extends AbstractList { private final Node[] nodes; @@ -156,7 +161,7 @@ } public Node set(int index, Node node) { - assert node.graph == self().graph; + assert node == Null || node.graph == self().graph; Node old = nodes[index]; if (old != node) { diff -r 98eef19a381c -r 46eab5817cc2 graal/GraalGraph/test/com/oracle/graal/graph/NodeTest.java --- a/graal/GraalGraph/test/com/oracle/graal/graph/NodeTest.java Thu Apr 28 18:58:35 2011 +0200 +++ b/graal/GraalGraph/test/com/oracle/graal/graph/NodeTest.java Fri Apr 29 11:16:06 2011 +0200 @@ -58,6 +58,7 @@ assertFalse(o3.inputs().contains(o2)); assertTrue(o3.inputs().contains(o4)); + assertTrue(o4.usages().contains(o3)); } private static class DummyNode extends Node {