Mercurial > hg > truffle

changeset 5025:df0deec2af08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetic simplifications in NewInstanceNode.ESCAPE.updateState
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 05 Mar 2012 14:38:43 +0100
parents 7ccdae96e98a
children b11561111585 e77a7d510c85
files graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/java/NewInstanceNode.java
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
                     }
                 }