# HG changeset patch # User Gilles Duboscq # Date 1330954723 -3600 # Node ID df0deec2af088763a8e03d634d7163d04edd862e # Parent 7ccdae96e98acaec3fbfd5c45ceaa40be2ff7f53 cosmetic simplifications in NewInstanceNode.ESCAPE.updateState diff -r 7ccdae96e98a -r df0deec2af08 graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/java/NewInstanceNode.java --- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/java/NewInstanceNode.java Mon Mar 05 14:35:26 2012 +0100 +++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/java/NewInstanceNode.java Mon Mar 05 14:38:43 2012 +0100 @@ -25,6 +25,7 @@ import java.util.*; import com.oracle.max.cri.ri.*; +import com.oracle.max.graal.debug.*; import com.oracle.max.graal.graph.*; import com.oracle.max.graal.nodes.*; import com.oracle.max.graal.nodes.spi.*; @@ -111,14 +112,15 @@ if (current instanceof AccessFieldNode) { AccessFieldNode x = (AccessFieldNode) current; if (x.object() == node) { - int field = fieldIndex.get(((AccessFieldNode) current).field()); + int field = fieldIndex.get(x.field()); + StructuredGraph graph = (StructuredGraph) x.graph(); if (current instanceof LoadFieldNode) { - assert fieldState[field] != null : field + ", " + ((AccessFieldNode) current).field(); + assert fieldState[field] != null : field + ", " + x.field(); x.replaceAtUsages(fieldState[field]); - ((StructuredGraph) x.graph()).removeFixed(x); + graph.removeFixed(x); } else if (current instanceof StoreFieldNode) { fieldState[field] = ((StoreFieldNode) x).value(); - ((StructuredGraph) x.graph()).removeFixed(x); + graph.removeFixed(x); return field; } }