--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/nodes/CyclicMaterializeStoreNode.java	Fri May 10 13:17:38 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.virtual.nodes;
-
-import com.oracle.graal.api.meta.*;
-import com.oracle.graal.graph.*;
-import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.java.*;
-import com.oracle.graal.nodes.spi.*;
-import com.oracle.graal.nodes.type.*;
-import com.oracle.graal.nodes.virtual.*;
-
-@NodeInfo(nameTemplate = "MaterializeStore#{p#target/s}")
-public final class CyclicMaterializeStoreNode extends FixedWithNextNode implements Lowerable, Virtualizable {
-
-    @Input private ValueNode object;
-    @Input private ValueNode value;
-    private final Object target;
-
-    public ValueNode object() {
-        return object;
-    }
-
-    public ValueNode value() {
-        return value;
-    }
-
-    public ResolvedJavaField targetField() {
-        return (ResolvedJavaField) target;
-    }
-
-    public int targetIndex() {
-        return (int) target;
-    }
-
-    public CyclicMaterializeStoreNode(ValueNode object, ValueNode value, ResolvedJavaField field) {
-        super(StampFactory.forVoid());
-        this.object = object;
-        this.value = value;
-        this.target = field;
-    }
-
-    public CyclicMaterializeStoreNode(ValueNode object, ValueNode value, int index) {
-        super(StampFactory.forVoid());
-        this.object = object;
-        this.value = value;
-        this.target = index;
-    }
-
-    @Override
-    public void lower(LoweringTool tool, LoweringType loweringType) {
-        ResolvedJavaType type = object.objectStamp().type();
-        FixedWithNextNode store;
-        if (target instanceof Integer) {
-            store = graph().add(new StoreIndexedNode(object, ConstantNode.forInt((int) target, graph()), type.getComponentType().getKind(), value));
-        } else {
-            assert target instanceof ResolvedJavaField;
-            store = graph().add(new StoreFieldNode(object, (ResolvedJavaField) target, value));
-        }
-        graph().replaceFixedWithFixed(this, store);
-    }
-
-    @Override
-    public void virtualize(VirtualizerTool tool) {
-        State state = tool.getObjectState(object);
-        if (state != null && state.getState() == EscapeState.Virtual) {
-            if (state.getVirtualObject() instanceof VirtualArrayNode) {
-                tool.setVirtualEntry(state, targetIndex(), value());
-            } else {
-                tool.setVirtualEntry(state, ((VirtualInstanceNode) state.getVirtualObject()).fieldIndex(targetField()), value());
-            }
-            tool.delete();
-        }
-    }
-}

--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java	Fri May 10 13:17:38 2013 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java	Fri May 10 13:18:51 2013 +0200
@@ -204,7 +204,7 @@
             ((Virtualizable) node).virtualize(tool);
         }
         if (tool.isDeleted()) {
-            if (!(node instanceof VirtualizableAllocation || node instanceof CyclicMaterializeStoreNode)) {
+            if (!(node instanceof VirtualizableAllocation)) {
                 changed = true;
             }
             return true;