# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1346158735 -7200
# Node ID 6a51bc21630666eb821b8e6ea060a85c158ece5d
# Parent  904517c1cd06b6f2ee8f088eb7700fc75c829258# Parent  1ed726759f656494ad7b0f20182598d5b1b53c92
Merge

diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaType.java	Tue Aug 28 14:58:55 2012 +0200
@@ -159,6 +159,8 @@
 
     /**
      * Returns the instance fields declared in this class sorted by field offset.
+     * A zero-length array is returned for array and primitive classes.
+     *
      * @return an array of instance fields
      */
     ResolvedJavaField[] declaredFields();
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.boot.test/src/com/oracle/graal/boot/BigBangTest.java
--- a/graal/com.oracle.graal.boot.test/src/com/oracle/graal/boot/BigBangTest.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.boot.test/src/com/oracle/graal/boot/BigBangTest.java	Tue Aug 28 14:58:55 2012 +0200
@@ -26,14 +26,14 @@
 
 public class BigBangTest {
 
-    @Test
+    //@Test
     public void helloWorldTest() {
         BootImageGenerator generator = new BootImageGenerator();
         generator.addEntryMethod(TestPrograms.class, "helloWorldTest");
         Assert.assertArrayEquals(generator.getBigBang().printState(), new int[]{3, 148, 66, 24});
     }
 
-    @Test
+    //@Test
     public void formattedOutputTest() {
         BootImageGenerator generator = new BootImageGenerator();
         generator.addEntryMethod(TestPrograms.class, "formattedOutputTest");
@@ -63,7 +63,7 @@
         Assert.assertArrayEquals(generator.getBigBang().printState(), new int[]{2, 28, 5, 3});
     }
 
-    @Test
+    //@Test
     public void arrayListTestWithCalls() {
         BootImageGenerator generator = new BootImageGenerator();
         generator.addEntryMethod(TestPrograms.class, "arrayListTestWithCalls");
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.boot.test/src/com/oracle/graal/boot/TestPrograms.java
--- a/graal/com.oracle.graal.boot.test/src/com/oracle/graal/boot/TestPrograms.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.boot.test/src/com/oracle/graal/boot/TestPrograms.java	Tue Aug 28 14:58:55 2012 +0200
@@ -24,6 +24,8 @@
 
 import java.util.*;
 
+//JaCoCo Exclude
+
 public class TestPrograms {
     public static void helloWorldTest() {
         System.out.println("Hello world!");
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.boot/src/com/oracle/graal/boot/BigBang.java
--- a/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/BigBang.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/BigBang.java	Tue Aug 28 14:58:55 2012 +0200
@@ -22,6 +22,7 @@
  */
 package com.oracle.graal.boot;
 
+import java.io.*;
 import java.lang.reflect.*;
 import java.util.*;
 import java.util.concurrent.*;
@@ -35,6 +36,20 @@
 
 public class BigBang {
 
+    public static final PrintStream out;
+    static {
+        if (Boolean.getBoolean("BigBang.verbose")) {
+            out = System.out;
+        } else {
+            OutputStream sink = new OutputStream() {
+                @Override
+                public void write(int b) throws IOException {
+                }
+            };
+            out = new PrintStream(sink);
+        }
+    }
+
     private static final int THREADS = 4;
 
     private MetaAccessProvider metaAccessProvider;
@@ -105,7 +120,7 @@
                 if (node instanceof FrameState || node instanceof MonitorEnterNode || node instanceof MonitorExitNode || node instanceof LoadFieldNode || node instanceof IsNullNode || node instanceof InstanceOfNode) {
                     // OK.
                 } else {
-                    System.out.println("Unknown sink - black hole? " + node);
+                    BigBang.out.println("Unknown sink - black hole? " + node);
                 }
             }
 
@@ -149,7 +164,7 @@
             if (localNode.kind() == Kind.Object) {
                 ResolvedJavaMethod method = ((StructuredGraph) localNode.graph()).method();
                 resultElement = getProcessedMethod(method).getParameter(localNode.index());
-                System.out.println("resultElement = " + resultElement + " index= " + localNode.index() + ", node=" + node);
+                BigBang.out.println("resultElement = " + resultElement + " index= " + localNode.index() + ", node=" + node);
             }
         }
 
@@ -159,7 +174,7 @@
     }
 
     public synchronized void postOperation(UniverseExpansionOp operation) {
-        System.out.println("posting operation " + operation);
+        BigBang.out.println("posting operation " + operation);
         executor.execute(operation);
         postedOperationCount++;
     }
@@ -210,7 +225,7 @@
             assert field.isStatic();
             if (field.getUsageCount() > 0 && field.getJavaField().kind() == Kind.Object) {
                 Object value = field.getJavaField().getValue(null).asObject();
-                System.out.printf("Root field %s: %s\n", field, value);
+                BigBang.out.printf("Root field %s: %s\n", field, value);
                 scanField(scannedObjects, field, value);
             }
         }
@@ -256,7 +271,7 @@
         for (MethodElement methodElement : methodMap.values()) {
             if (methodElement.hasGraph()) {
                 if (Modifier.isNative(methodElement.getResolvedJavaMethod().accessFlags())) {
-                    System.out.println("Included native method: " + methodElement.getResolvedJavaMethod());
+                    BigBang.out.println("Included native method: " + methodElement.getResolvedJavaMethod());
                     nativeMethodCount++;
                 }
             }
@@ -266,7 +281,7 @@
         for (MethodElement methodElement : methodMap.values()) {
             if (methodElement.hasGraph()) {
                 if (!Modifier.isNative(methodElement.getResolvedJavaMethod().accessFlags())) {
-                    System.out.println("Included method: " + methodElement.getResolvedJavaMethod());
+                    BigBang.out.println("Included method: " + methodElement.getResolvedJavaMethod());
                     methodCount++;
                 }
             }
@@ -276,16 +291,16 @@
         int fieldCount = 0;
         for (FieldElement fieldElement : fieldMap.values()) {
             if (fieldElement.getUsageCount() > 0) {
-                System.out.print("Included field: " + fieldElement.getJavaField() + " / ");
+                BigBang.out.print("Included field: " + fieldElement.getJavaField() + " / ");
                 fieldElement.printSeenTypes();
-                System.out.println();
+                BigBang.out.println();
                 fieldCount++;
                 includedTypes.add(fieldElement.getJavaField().holder());
             }
         }
 
         for (ResolvedJavaType type : includedTypes) {
-            System.out.println("Included type: " + type);
+            BigBang.out.println("Included type: " + type);
         }
 
         System.out.println("Number of included native methods: " + nativeMethodCount);
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.boot/src/com/oracle/graal/boot/BootImageGenerator.java
--- a/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/BootImageGenerator.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/BootImageGenerator.java	Tue Aug 28 14:58:55 2012 +0200
@@ -43,7 +43,7 @@
         } catch (NoSuchMethodException | SecurityException e) {
             throw new RuntimeException("Could not find method " + name + " with parameter types " + parameterTypes + " in class " + convertedClass.getCanonicalName());
         }
-        System.out.printf("Adding method %s.%s to the boot image\n", method.getDeclaringClass().getName(), method.getName());
+        BigBang.out.printf("Adding method %s.%s to the boot image\n", method.getDeclaringClass().getName(), method.getName());
         addEntryMethod(metaAccess.getResolvedJavaMethod(method));
     }
 
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/ArrayTypeElement.java
--- a/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/ArrayTypeElement.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/ArrayTypeElement.java	Tue Aug 28 14:58:55 2012 +0200
@@ -50,16 +50,16 @@
         LoadIndexedNode load = (LoadIndexedNode) use;
         ResolvedJavaType type = load.array().objectStamp().type();
         if (type == null) {
-            System.out.println("FATAL error: Array access without type!");
-            System.out.println(load.array());
+            BigBang.out.println("FATAL error: Array access without type!");
+            BigBang.out.println(load.array());
             if (load.array() instanceof ValueProxyNode) {
                 ValueProxyNode valueProxyNode = (ValueProxyNode) load.array();
-                System.out.println("value proxy node stamp " + valueProxyNode.stamp());
-                System.out.println("value proxy node stamp type " + valueProxyNode.objectStamp().type());
-                System.out.println("value proxy source: " + valueProxyNode.value());
-                System.out.println("value proxy source stamp: " + valueProxyNode.value().stamp());
+                BigBang.out.println("value proxy node stamp " + valueProxyNode.stamp());
+                BigBang.out.println("value proxy node stamp type " + valueProxyNode.objectStamp().type());
+                BigBang.out.println("value proxy source: " + valueProxyNode.value());
+                BigBang.out.println("value proxy source stamp: " + valueProxyNode.value().stamp());
             }
-            System.out.println(((StructuredGraph) load.graph()).method());
+            BigBang.out.println(((StructuredGraph) load.graph()).method());
             System.exit(-1);
         }
         ResolvedJavaType componentType = type.componentType();
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/CastElement.java
--- a/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/CastElement.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/CastElement.java	Tue Aug 28 14:58:55 2012 +0200
@@ -48,7 +48,7 @@
             if (type.isSubtypeOf(checkCastNode.targetClass())) {
                 newSet.add(type);
             } else {
-                System.out.println("filtering " + type + " vs " + checkCastNode.targetClass());
+                BigBang.out.println("filtering " + type + " vs " + checkCastNode.targetClass());
             }
         }
         super.unionTypes(bb, sourceNode, newSet);
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/Element.java
--- a/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/Element.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/Element.java	Tue Aug 28 14:58:55 2012 +0200
@@ -74,7 +74,7 @@
             if (declaredType != null) {
                 for (ResolvedJavaType seenType : newSeenTypes) {
                     if (!seenType.isSubtypeOf(declaredType)) {
-                        System.out.println("Wrong type found " + seenType + " where declared type of element " + this + " is " + declaredType);
+                        BigBang.out.println("Wrong type found " + seenType + " where declared type of element " + this + " is " + declaredType);
                         System.exit(-1);
                     }
                 }
@@ -121,7 +121,7 @@
 
     public synchronized void printSeenTypes() {
         for (ResolvedJavaType type : seenTypes) {
-            System.out.print(type.name() + " ");
+            BigBang.out.print(type.name() + " ");
         }
     }
 }
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/InvokeElement.java
--- a/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/InvokeElement.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/InvokeElement.java	Tue Aug 28 14:58:55 2012 +0200
@@ -47,11 +47,11 @@
     @Override
     protected synchronized void unionTypes(BigBang bb, Node sourceNode, Set<ResolvedJavaType> newSeenTypes) {
 
-        System.out.println("union invoke element " + this + " new types = " + newSeenTypes + " sourceNode= " + sourceNode);
+        BigBang.out.println("union invoke element " + this + " new types = " + newSeenTypes + " sourceNode= " + sourceNode);
         int index = 0;
         for (Node arg : methodCallTarget.arguments()) {
             if (arg == sourceNode) {
-                System.out.println("source node " + sourceNode + " is at index " + index + " stamp=" + ((ValueNode) sourceNode).stamp());
+                BigBang.out.println("source node " + sourceNode + " is at index " + index + " stamp=" + ((ValueNode) sourceNode).stamp());
                 unionTypes(bb, sourceNode, newSeenTypes, index);
             }
             ++index;
@@ -79,9 +79,9 @@
                 if (seenTypes.add(type)) {
                     // There is a new receiver type!
                     ResolvedJavaMethod method = type.resolveMethodImpl(methodCallTarget.targetMethod());
-                    System.out.println("resolved method " + method + " for type " + type + " and method " + methodCallTarget.targetMethod());
+                    BigBang.out.println("resolved method " + method + " for type " + type + " and method " + methodCallTarget.targetMethod());
                     if (method == null) {
-                        System.out.println("!!! type = " + type + " / " + methodCallTarget.targetMethod());
+                        BigBang.out.println("!!! type = " + type + " / " + methodCallTarget.targetMethod());
                     }
                     if (!concreteTargets.contains(method)) {
                         concreteTargets.add(method);
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/MethodElement.java
--- a/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/MethodElement.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.boot/src/com/oracle/graal/boot/meta/MethodElement.java	Tue Aug 28 14:58:55 2012 +0200
@@ -92,11 +92,11 @@
         }
 
         if (Modifier.isNative(resolvedJavaMethod.accessFlags())) {
-            System.out.println("NATIVE METHOD " + resolvedJavaMethod);
+            BigBang.out.println("NATIVE METHOD " + resolvedJavaMethod);
             return;
         }
 
-        System.out.println("parsing graph " + resolvedJavaMethod + ", locals=" + resolvedJavaMethod.maxLocals());
+        BigBang.out.println("parsing graph " + resolvedJavaMethod + ", locals=" + resolvedJavaMethod.maxLocals());
         GraphBuilderConfiguration config = new GraphBuilderConfiguration(ResolvePolicy.Eager, null);
         GraphBuilderPhase graphBuilderPhase = new GraphBuilderPhase(bb.getMetaAccess(), config, OptimisticOptimizations.NONE);
         graphBuilderPhase.apply(newGraph);
@@ -113,7 +113,7 @@
         for (NewInstanceNode newInstance : newGraph.getNodes(NewInstanceNode.class)) {
             Set<ResolvedJavaType> types = new HashSet<>();
             types.add(newInstance.instanceClass());
-            System.out.println("propagate new instance " + newInstance + ", " + newInstance.instanceClass());
+            BigBang.out.println("propagate new instance " + newInstance + ", " + newInstance.instanceClass());
             for (Node use : newInstance.usages()) {
                 Element element = bb.getSinkElement(use, newInstance);
                 assert element != null;
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java	Tue Aug 28 14:58:55 2012 +0200
@@ -43,25 +43,30 @@
 
 
     private HashMap<VirtualObjectNode, VirtualObject> virtualObjects = new HashMap<>();
+    private IdentityHashMap<VirtualObjectNode, EscapeObjectState> objectStates = new IdentityHashMap<>();
 
     public LIRFrameState build(FrameState topState, LockScope locks, List<StackSlot> pointerSlots, LabelRef exceptionEdge, long leafGraphId) {
         assert virtualObjects.size() == 0;
+        assert objectStates.size() == 0;
+
+        // collect all VirtualObjectField instances:
+        FrameState current = topState;
+        do {
+            for (EscapeObjectState state : current.virtualObjectMappings()) {
+                if (objectStates == null) {
+                    objectStates = new IdentityHashMap<>();
+                }
+                if (!objectStates.containsKey(state.object())) {
+                    objectStates.put(state.object(), state);
+                }
+            }
+            current = current.outerFrameState();
+        } while (current != null);
+
         BytecodeFrame frame = computeFrameForState(topState, locks, leafGraphId);
 
         VirtualObject[] virtualObjectsArray = null;
         if (virtualObjects.size() != 0) {
-            // collect all VirtualObjectField instances:
-            IdentityHashMap<VirtualObjectNode, VirtualObjectState> objectStates = new IdentityHashMap<>();
-            FrameState current = topState;
-            do {
-                for (VirtualObjectState state : current.virtualObjectMappings()) {
-                    // null states occur for objects with 0 fields
-                    if (!objectStates.containsKey(state.object())) {
-                        objectStates.put(state.object(), state);
-                    }
-                }
-                current = current.outerFrameState();
-            } while (current != null);
             // fill in the VirtualObject values:
             // during this process new VirtualObjects might be discovered, so repeat until no more changes occur.
             boolean changed;
@@ -79,7 +84,7 @@
                             entry.getValue().setValues(values);
                             if (values.length > 0) {
                                 changed = true;
-                                VirtualObjectState currentField = objectStates.get(vobj);
+                                VirtualObjectState currentField = (VirtualObjectState) objectStates.get(vobj);
                                 assert currentField != null;
                                 for (int i = 0; i < vobj.fieldsCount(); i++) {
                                     values[i] = toValue(currentField.fieldValues().get(i));
@@ -93,6 +98,7 @@
             virtualObjectsArray = virtualObjects.values().toArray(new VirtualObject[virtualObjects.size()]);
             virtualObjects.clear();
         }
+        objectStates.clear();
 
         return new LIRFrameState(frame, virtualObjectsArray, pointerSlots, exceptionEdge);
     }
@@ -138,14 +144,23 @@
     private Value toValue(ValueNode value) {
         if (value instanceof VirtualObjectNode) {
             VirtualObjectNode obj = (VirtualObjectNode) value;
-            VirtualObject ciObj = virtualObjects.get(value);
-            if (ciObj == null) {
-                ciObj = VirtualObject.get(obj.type(), null, virtualObjects.size());
-                virtualObjects.put(obj, ciObj);
+            EscapeObjectState state = objectStates.get(obj);
+            if (state == null && obj.fieldsCount() > 0) {
+                // null states occur for objects with 0 fields
+                throw new GraalInternalError("no mapping found for virtual object %s", obj);
             }
-            Debug.metric("StateVirtualObjects").increment();
-            return ciObj;
-
+            if (state instanceof MaterializedObjectState) {
+                return toValue(((MaterializedObjectState) state).materializedValue());
+            } else {
+                assert obj.fieldsCount() == 0 || state instanceof VirtualObjectState;
+                VirtualObject ciObj = virtualObjects.get(value);
+                if (ciObj == null) {
+                    ciObj = VirtualObject.get(obj.type(), null, virtualObjects.size());
+                    virtualObjects.put(obj, ciObj);
+                }
+                Debug.metric("StateVirtualObjects").increment();
+                return ciObj;
+            }
         } else if (value instanceof ConstantNode) {
             Debug.metric("StateConstants").increment();
             return ((ConstantNode) value).value;
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BoxingEliminationPhase.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BoxingEliminationPhase.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BoxingEliminationPhase.java	Tue Aug 28 14:58:55 2012 +0200
@@ -36,6 +36,8 @@
 
 public class BoxingEliminationPhase extends Phase {
 
+    private int virtualIds = Integer.MIN_VALUE;
+
     @Override
     protected void run(StructuredGraph graph) {
         if (graph.getNodes(UnboxNode.class).isNotEmpty()) {
@@ -105,7 +107,7 @@
         }
     }
 
-    private static void tryEliminate(BoxNode boxNode) {
+    private void tryEliminate(BoxNode boxNode) {
 
         assert boxNode.objectStamp().isExactType();
         virtualizeUsages(boxNode, boxNode.source(), boxNode.objectStamp().type());
@@ -122,12 +124,12 @@
         ((StructuredGraph) boxNode.graph()).removeFixed(boxNode);
     }
 
-    private static void virtualizeUsages(ValueNode boxNode, ValueNode replacement, ResolvedJavaType exactType) {
+    private void virtualizeUsages(ValueNode boxNode, ValueNode replacement, ResolvedJavaType exactType) {
         ValueNode virtualValueNode = null;
         VirtualObjectNode virtualObjectNode = null;
         for (Node n : boxNode.usages().filter(NodePredicates.isA(VirtualState.class)).snapshot()) {
             if (virtualValueNode == null) {
-                virtualObjectNode = n.graph().unique(new BoxedVirtualObjectNode(exactType, replacement));
+                virtualObjectNode = n.graph().unique(new BoxedVirtualObjectNode(virtualIds++, exactType, replacement));
             }
             n.replaceFirstInput(boxNode, virtualObjectNode);
         }
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/CanonicalizerPhase.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/CanonicalizerPhase.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/CanonicalizerPhase.java	Tue Aug 28 14:58:55 2012 +0200
@@ -180,6 +180,7 @@
 
     public static boolean tryCanonicalize(final Node node, final StructuredGraph graph, final SimplifierTool tool) {
         if (node instanceof Canonicalizable) {
+            assert !(node instanceof Simplifiable);
             METRIC_CANONICALIZATION_CONSIDERED_NODES.increment();
             return Debug.scope("CanonicalizeNode", node, new Callable<Boolean>(){
                 public Boolean call() {
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java	Tue Aug 28 14:58:55 2012 +0200
@@ -38,13 +38,13 @@
 import com.oracle.graal.nodes.virtual.*;
 import com.oracle.max.criutils.*;
 
-
 public class EscapeAnalysisPhase extends Phase {
 
     /**
      * Encapsulates the state of the virtual object, which is updated while traversing the control flow graph.
      */
-    public static class BlockExitState implements MergeableState<BlockExitState> {
+    private static class BlockExitState implements MergeableState<BlockExitState> {
+
         public final ValueNode[] fieldState;
         public final VirtualObjectNode virtualObject;
         public final Graph graph;
@@ -115,16 +115,17 @@
         }
     }
 
-
-    public static class EscapementFixup {
+    private static class EscapementFixup {
 
         private final Map<Object, Integer> fields = new HashMap<>();
         private final EscapeOp op;
         private final StructuredGraph graph;
         private final FixedWithNextNode node;
         private EscapeField[] escapeFields;
+        private final int id;
 
-        public EscapementFixup(EscapeOp op, StructuredGraph graph, FixedWithNextNode node) {
+        public EscapementFixup(int id, EscapeOp op, StructuredGraph graph, FixedWithNextNode node) {
+            this.id = id;
             this.op = op;
             this.graph = graph;
             this.node = node;
@@ -151,7 +152,7 @@
                 fields.put(escapeFields[i].representation(), i);
             }
             assert node.objectStamp().isExactType();
-            final VirtualObjectNode virtual = graph.add(new VirtualObjectNode(node.objectStamp().type(), escapeFields));
+            final VirtualObjectNode virtual = graph.add(new VirtualObjectNode(id, node.objectStamp().type(), escapeFields.length));
             if (GraalOptions.TraceEscapeAnalysis || GraalOptions.PrintEscapeAnalysis) {
                 TTY.println("new virtual object: " + virtual);
             }
@@ -170,6 +171,7 @@
             if (virtual.fieldsCount() > 0) {
                 final BlockExitState startState = new BlockExitState(escapeFields, virtual);
                 new PostOrderNodeIterator<BlockExitState>(next, startState) {
+
                     @Override
                     protected void node(FixedNode curNode) {
                         op.updateState(virtual, curNode, fields, state.fieldState);
@@ -188,6 +190,10 @@
         }
     }
 
+
+    private int virtualIds = 0;
+
+
     private final TargetDescription target;
     private final GraalCodeCacheProvider runtime;
     private final Assumptions assumptions;
@@ -204,7 +210,7 @@
         this.optimisticOpts = optimisticOpts;
     }
 
-    public static class EscapeRecord {
+    private static class EscapeRecord {
 
         public final Node node;
         public final ArrayList<Node> escapesThrough = new ArrayList<>();
@@ -380,7 +386,7 @@
     }
 
     protected void removeAllocation(StructuredGraph graph, FixedWithNextNode node, EscapeOp op) {
-        new EscapementFixup(op, graph, node).apply();
+        new EscapementFixup(virtualIds++, op, graph, node).apply();
 
         for (PhiNode phi : node.graph().getNodes(PhiNode.class)) {
             ValueNode simpleValue = phi;
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/util/InliningUtil.java	Tue Aug 28 14:58:55 2012 +0200
@@ -196,7 +196,7 @@
             ValueAnchorNode anchor = graph.add(new ValueAnchorNode());
             assert invoke.predecessor() != null;
 
-            ValueNode anchoredReceiver = createAnchoredReceiver(graph, anchor, type, receiver);
+            ValueNode anchoredReceiver = createAnchoredReceiver(graph, anchor, type, receiver, true);
             invoke.callTarget().replaceFirstInput(receiver, anchoredReceiver);
 
             graph.addBeforeFixed(invoke.node(), objectClass);
@@ -352,7 +352,8 @@
 
                 ResolvedJavaType commonType = getLeastCommonType(i);
                 ValueNode receiver = invokeForInlining.callTarget().receiver();
-                PiNode anchoredReceiver = createAnchoredReceiver(graph, node, commonType, receiver);
+                boolean exact = getTypeCount(i) == 1;
+                PiNode anchoredReceiver = createAnchoredReceiver(graph, node, commonType, receiver, exact);
                 invokeForInlining.callTarget().replaceFirstInput(receiver, anchoredReceiver);
 
                 ResolvedJavaMethod concrete = concretes.get(i);
@@ -388,6 +389,16 @@
             }
         }
 
+        private int getTypeCount(int concreteMethodIndex) {
+            int count = 0;
+            for (int i = 0; i < typesToConcretes.length; i++) {
+                if (typesToConcretes[i] == concreteMethodIndex) {
+                    count++;
+                }
+            }
+            return count;
+        }
+
         private ResolvedJavaType getLeastCommonType(int concreteMethodIndex) {
             ResolvedJavaType commonType = null;
             for (int i = 0; i < typesToConcretes.length; i++) {
@@ -709,9 +720,9 @@
         }
     }
 
-    private static PiNode createAnchoredReceiver(StructuredGraph graph, FixedNode anchor, ResolvedJavaType commonType, ValueNode receiver) {
+    private static PiNode createAnchoredReceiver(StructuredGraph graph, FixedNode anchor, ResolvedJavaType commonType, ValueNode receiver, boolean exact) {
         // to avoid that floating reads on receiver fields float above the type check
-        return graph.unique(new PiNode(receiver, anchor, StampFactory.declaredNonNull(commonType)));
+        return graph.unique(new PiNode(receiver, anchor, exact ? StampFactory.exactNonNull(commonType) : StampFactory.declaredNonNull(commonType)));
     }
 
     private static boolean checkInvokeConditions(Invoke invoke) {
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeMap.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeMap.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeMap.java	Tue Aug 28 14:58:55 2012 +0200
@@ -23,8 +23,7 @@
 package com.oracle.graal.graph;
 
 import java.util.AbstractMap.SimpleEntry;
-import java.util.Arrays;
-import java.util.Iterator;
+import java.util.*;
 import java.util.Map.Entry;
 
 
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java	Tue Aug 28 14:58:55 2012 +0200
@@ -250,7 +250,11 @@
     @Override
     public ResolvedJavaField[] declaredFields() {
         if (fields == null) {
-            fields = HotSpotGraalRuntime.getInstance().getCompilerToVM().JavaType_fields(this);
+            if (isArrayClass) {
+                fields = new ResolvedJavaField[0];
+            } else {
+                fields = HotSpotGraalRuntime.getInstance().getCompilerToVM().JavaType_fields(this);
+            }
         }
         return fields;
     }
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypePrimitive.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypePrimitive.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotTypePrimitive.java	Tue Aug 28 14:58:55 2012 +0200
@@ -152,7 +152,7 @@
 
     @Override
     public ResolvedJavaField[] declaredFields() {
-        return null;
+        return new ResolvedJavaField[0];
     }
 
     @Override
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java	Tue Aug 28 14:58:55 2012 +0200
@@ -100,7 +100,7 @@
 
     @Input private final NodeInputList<ValueNode> values;
 
-    @Input private final NodeInputList<VirtualObjectState> virtualObjectMappings;
+    @Input private final NodeInputList<EscapeObjectState> virtualObjectMappings;
 
     /**
      * The bytecode index to which this frame state applies.
@@ -117,7 +117,7 @@
      * @param stackSize size of the stack
      * @param rethrowException if true the VM should re-throw the exception on top of the stack when deopt'ing using this framestate
      */
-    public FrameState(ResolvedJavaMethod method, int bci, List<ValueNode> values, int stackSize, boolean rethrowException, boolean duringCall, InliningIdentifier inliningIdentifier, List<VirtualObjectState> virtualObjectMappings) {
+    public FrameState(ResolvedJavaMethod method, int bci, List<ValueNode> values, int stackSize, boolean rethrowException, boolean duringCall, InliningIdentifier inliningIdentifier, List<EscapeObjectState> virtualObjectMappings) {
         assert stackSize >= 0;
         assert (bci >= 0 && method != null) || (bci < 0 && method == null && values.isEmpty());
         this.method = method;
@@ -137,7 +137,7 @@
      * @param bci marker bci, needs to be < 0
      */
     public FrameState(int bci) {
-        this(null, bci, Collections.<ValueNode>emptyList(), 0, false, false, null, Collections.<VirtualObjectState>emptyList());
+        this(null, bci, Collections.<ValueNode>emptyList(), 0, false, false, null, Collections.<EscapeObjectState>emptyList());
     }
 
     public FrameState(ResolvedJavaMethod method, int bci, ValueNode[] locals, ValueNode[] stack, int stackSize, boolean rethrowException, boolean duringCall, InliningIdentifier inliningIdentifier) {
@@ -199,7 +199,7 @@
         return method;
     }
 
-    public void addVirtualObjectMapping(VirtualObjectState virtualObject) {
+    public void addVirtualObjectMapping(EscapeObjectState virtualObject) {
         virtualObjectMappings.add(virtualObject);
     }
 
@@ -211,7 +211,7 @@
         return virtualObjectMappings.get(i);
     }
 
-    public NodeInputList<VirtualObjectState> virtualObjectMappings() {
+    public NodeInputList<EscapeObjectState> virtualObjectMappings() {
         return virtualObjectMappings;
     }
 
@@ -241,8 +241,8 @@
         if (newOuterFrameState != null) {
             newOuterFrameState = newOuterFrameState.duplicateWithVirtualState();
         }
-        ArrayList<VirtualObjectState> newVirtualMappings = new ArrayList<>(virtualObjectMappings.size());
-        for (VirtualObjectState state : virtualObjectMappings) {
+        ArrayList<EscapeObjectState> newVirtualMappings = new ArrayList<>(virtualObjectMappings.size());
+        for (EscapeObjectState state : virtualObjectMappings) {
             newVirtualMappings.add(state.duplicateWithVirtualState());
         }
         FrameState other = graph().add(new FrameState(method, bci, values, stackSize, rethrowException, duringCall, inliningIdentifier, newVirtualMappings));
@@ -380,7 +380,7 @@
         for (ValueNode value : values.nonNull()) {
             closure.apply(this, value);
         }
-        for (VirtualObjectState state : virtualObjectMappings) {
+        for (EscapeObjectState state : virtualObjectMappings) {
             state.applyToNonVirtual(closure);
         }
         if (outerFrameState() != null) {
@@ -391,7 +391,7 @@
     @Override
     public void applyToVirtual(VirtualClosure closure) {
         closure.apply(this);
-        for (VirtualObjectState state : virtualObjectMappings) {
+        for (EscapeObjectState state : virtualObjectMappings) {
             state.applyToVirtual(closure);
         }
         if (outerFrameState() != null) {
@@ -407,7 +407,7 @@
         if (outerFrameState() != null && outerFrameState().isPartOfThisState(state)) {
             return true;
         }
-        for (VirtualObjectState objectState : virtualObjectMappings) {
+        for (EscapeObjectState objectState : virtualObjectMappings) {
             if (objectState.isPartOfThisState(state)) {
                 return true;
             }
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java	Tue Aug 28 14:58:55 2012 +0200
@@ -53,6 +53,11 @@
 
     @Override
     public boolean inferStamp() {
+        if (object().objectStamp().alwaysNull() && objectStamp().nonNull()) {
+            // a null value flowing into a nonNull PiNode can happen should be guarded by a type/isNull guard, but the
+            // compiler might see this situation before the branch is deleted
+            return false;
+        }
         return updateStamp(stamp().join(object().stamp()));
     }
 }
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java	Tue Aug 28 14:58:55 2012 +0200
@@ -22,6 +22,7 @@
  */
 package com.oracle.graal.nodes.extended;
 
+import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.graph.*;
 import com.oracle.graal.nodes.*;
@@ -31,7 +32,7 @@
 /**
  * Reads an {@linkplain AccessNode accessed} value.
  */
-public final class ReadNode extends AccessNode implements Node.IterableNodeType, LIRLowerable/*, Canonicalizable*/ {
+public final class ReadNode extends AccessNode implements Node.IterableNodeType, LIRLowerable, Simplifiable/*, Canonicalizable*/ {
 
     public ReadNode(ValueNode object, LocationNode location, Stamp stamp) {
         super(object, location, stamp);
@@ -42,7 +43,7 @@
         gen.setResult(this, gen.emitLoad(gen.makeAddress(location(), object()), getNullCheck()));
     }
 
-    // Canonicalization disabled untill we have a solution for non-Object oops in Hotspot
+    // Canonicalization disabled until we have a solution for non-Object oops in Hotspot
     /*@Override
     public ValueNode canonical(CanonicalizerTool tool) {
         return canonicalizeRead(this, tool);
@@ -64,4 +65,16 @@
         }
         return (ValueNode) read;
     }
+
+    @Override
+    public void simplify(SimplifierTool tool) {
+        if (object().isConstant() && object().asConstant().isNull()) {
+            FixedNode successor = next();
+            tool.deleteBranch(successor);
+            if (isAlive()) {
+                replaceAtPredecessor(graph().add(new DeoptimizeNode(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.NullCheckException)));
+                safeDelete();
+            }
+        }
+    }
 }
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java	Tue Aug 28 14:58:55 2012 +0200
@@ -22,6 +22,8 @@
  */
 package com.oracle.graal.nodes.extended;
 
+import com.oracle.graal.api.code.*;
+import com.oracle.graal.api.meta.*;
 import com.oracle.graal.nodes.*;
 import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.nodes.type.*;
@@ -30,7 +32,7 @@
 /**
  * Writes a given {@linkplain #value() value} a {@linkplain AccessNode memory location}.
  */
-public final class WriteNode extends AccessNode implements StateSplit, LIRLowerable {
+public final class WriteNode extends AccessNode implements StateSplit, LIRLowerable, Simplifiable {
     @Input private ValueNode value;
     @Input(notDataflow = true) private FrameState stateAfter;
 
@@ -61,4 +63,16 @@
     public void generate(LIRGeneratorTool gen) {
         gen.emitStore(gen.makeAddress(location(), object()), gen.operand(value()), getNullCheck());
     }
+
+    @Override
+    public void simplify(SimplifierTool tool) {
+        if (object().isConstant() && object().asConstant().isNull()) {
+            FixedNode successor = next();
+            tool.deleteBranch(successor);
+            if (isAlive()) {
+                replaceAtPredecessor(graph().add(new DeoptimizeNode(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.NullCheckException)));
+                safeDelete();
+            }
+        }
+    }
 }
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/AccessIndexedNode.java	Tue Aug 28 14:58:55 2012 +0200
@@ -24,13 +24,14 @@
 
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.nodes.*;
+import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.nodes.type.*;
 
 /**
  * The {@code AccessIndexedNode} class is the base class of instructions that read or write
  * elements of an array.
  */
-public abstract class AccessIndexedNode extends AccessArrayNode {
+public abstract class AccessIndexedNode extends AccessArrayNode implements Lowerable {
 
     @Input private ValueNode index;
     private final Kind elementType;
@@ -65,4 +66,9 @@
     public long leafGraphId() {
         return leafGraphId;
     }
+
+    @Override
+    public void lower(LoweringTool tool) {
+        tool.getRuntime().lower(this, tool);
+    }
 }
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadIndexedNode.java	Tue Aug 28 14:58:55 2012 +0200
@@ -33,7 +33,7 @@
 /**
  * The {@code LoadIndexedNode} represents a read from an element of an array.
  */
-public final class LoadIndexedNode extends AccessIndexedNode implements Canonicalizable, Lowerable, Node.IterableNodeType {
+public final class LoadIndexedNode extends AccessIndexedNode implements Canonicalizable, Node.IterableNodeType {
 
     /**
      * Creates a new LoadIndexedNode.
@@ -54,11 +54,6 @@
     }
 
     @Override
-    public void lower(LoweringTool tool) {
-        tool.getRuntime().lower(this, tool);
-    }
-
-    @Override
     public ValueNode canonical(CanonicalizerTool tool) {
         MetaAccessProvider runtime = tool.runtime();
         if (runtime != null && index().isConstant() && array().isConstant() && !array().isNullConstant()) {
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MaterializeObjectNode.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MaterializeObjectNode.java	Tue Aug 28 14:58:55 2012 +0200
@@ -0,0 +1,94 @@
+/*
+ * 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.nodes.java;
+
+import com.oracle.graal.api.meta.*;
+import com.oracle.graal.graph.*;
+import com.oracle.graal.nodes.*;
+import com.oracle.graal.nodes.spi.*;
+import com.oracle.graal.nodes.type.*;
+
+@NodeInfo(nameTemplate = "Materialize {p#type/s}")
+public final class MaterializeObjectNode extends FixedWithNextNode implements Lowerable, Node.IterableNodeType {
+
+    @Input private final NodeInputList<ValueNode> values;
+    private final ResolvedJavaType type;
+    private final EscapeField[] fields;
+
+    public MaterializeObjectNode(ResolvedJavaType type, EscapeField[] fields, ValueNode[] values) {
+        super(StampFactory.exactNonNull(type));
+        this.type = type;
+        this.fields = fields;
+        this.values = new NodeInputList<>(this, values);
+    }
+
+    public ResolvedJavaType type() {
+        return type;
+    }
+
+    public EscapeField[] getFields() {
+        return fields;
+    }
+
+    public NodeInputList<ValueNode> getValues() {
+        return values;
+    }
+
+    @Override
+    public void lower(LoweringTool tool) {
+        StructuredGraph graph = (StructuredGraph) graph();
+        if (type.isArrayClass()) {
+            ResolvedJavaType element = type.componentType();
+            NewArrayNode newArray;
+            if (element.kind() == Kind.Object) {
+                newArray = graph.add(new NewObjectArrayNode(element, ConstantNode.forInt(fields.length, graph)));
+            } else {
+                newArray = graph.add(new NewPrimitiveArrayNode(element, ConstantNode.forInt(fields.length, graph)));
+            }
+            this.replaceAtUsages(newArray);
+            graph.addAfterFixed(this, newArray);
+
+            FixedWithNextNode position = newArray;
+            for (int i = 0; i < fields.length; i++) {
+                StoreIndexedNode store = graph.add(new StoreIndexedNode(newArray, ConstantNode.forInt(i, graph), element.kind(), values.get(i), -1));
+                graph.addAfterFixed(position, store);
+                position = store;
+            }
+
+            graph.removeFixed(this);
+        } else {
+            NewInstanceNode newInstance = graph.add(new NewInstanceNode(type));
+            this.replaceAtUsages(newInstance);
+            graph.addAfterFixed(this, newInstance);
+
+            FixedWithNextNode position = newInstance;
+            for (int i = 0; i < fields.length; i++) {
+                StoreFieldNode store = graph.add(new StoreFieldNode(newInstance, (ResolvedJavaField) fields[i].representation(), values.get(i), -1));
+                graph.addAfterFixed(position, store);
+                position = store;
+            }
+
+            graph.removeFixed(this);
+        }
+    }
+}
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java	Tue Aug 28 14:58:55 2012 +0200
@@ -80,7 +80,12 @@
     }
 
     public EscapeOp getEscapeOp() {
-        return ESCAPE;
+        Constant constantLength = length().asConstant();
+        if (constantLength != null && constantLength.asInt() >= 0 && constantLength.asInt() < MaximumEscapeAnalysisArrayLength) {
+            return ESCAPE;
+        } else {
+            return null;
+        }
     }
 
     @Override
@@ -110,6 +115,12 @@
         }
 
         @Override
+        public ResolvedJavaType type(Node node) {
+            NewArrayNode x = (NewArrayNode) node;
+            return x.elementType.arrayOf();
+        }
+
+        @Override
         public void beforeUpdate(Node node, Node usage) {
             if (usage instanceof ArrayLengthNode) {
                 ArrayLengthNode x = (ArrayLengthNode) usage;
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewInstanceNode.java	Tue Aug 28 14:58:55 2012 +0200
@@ -67,7 +67,7 @@
     }
 
     public EscapeOp getEscapeOp() {
-        return ESCAPE;
+        return instanceClass == null ? null : ESCAPE;
     }
 
     private static final EscapeOp ESCAPE = new EscapeOp() {
@@ -89,6 +89,12 @@
         }
 
         @Override
+        public ResolvedJavaType type(Node node) {
+            NewInstanceNode x = (NewInstanceNode) node;
+            return x.instanceClass();
+        }
+
+        @Override
         public EscapeField[] fields(Node node) {
             NewInstanceNode x = (NewInstanceNode) node;
             List<EscapeField> escapeFields = new ArrayList<>();
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/StoreIndexedNode.java	Tue Aug 28 14:58:55 2012 +0200
@@ -64,9 +64,4 @@
         super(StampFactory.forVoid(), array, index, elementKind, leafGraphId);
         this.value = value;
     }
-
-    @Override
-    public void lower(LoweringTool tool) {
-        tool.getRuntime().lower(this, tool);
-    }
 }
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/EscapeOp.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/EscapeOp.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/EscapeOp.java	Tue Aug 28 14:58:55 2012 +0200
@@ -101,6 +101,8 @@
 
     public abstract EscapeField[] fields(Node node);
 
+    public abstract ResolvedJavaType type(Node node);
+
     public void beforeUpdate(Node node, Node usage) {
         // IsNonNullNode and IsTypeNode should have been eliminated by the CanonicalizerPhase, but we can't rely on this
         if (usage instanceof IsNullNode) {
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/BoxedVirtualObjectNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/BoxedVirtualObjectNode.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/BoxedVirtualObjectNode.java	Tue Aug 28 14:58:55 2012 +0200
@@ -32,8 +32,8 @@
 
     @Input ValueNode unboxedValue;
 
-    public BoxedVirtualObjectNode(ResolvedJavaType type, ValueNode unboxedValue) {
-        super(type, 1);
+    public BoxedVirtualObjectNode(int id, ResolvedJavaType type, ValueNode unboxedValue) {
+        super(id, type, 1);
         this.unboxedValue = unboxedValue;
     }
 
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/EscapeObjectState.java	Tue Aug 28 14:58:55 2012 +0200
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2009, 2012, 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.nodes.virtual;
+
+import com.oracle.graal.graph.*;
+import com.oracle.graal.nodes.*;
+import com.oracle.graal.nodes.spi.*;
+
+public abstract class EscapeObjectState extends VirtualState implements Node.IterableNodeType, LIRLowerable {
+
+    @Input private VirtualObjectNode object;
+
+    public VirtualObjectNode object() {
+        return object;
+    }
+
+    public EscapeObjectState(VirtualObjectNode object) {
+        this.object = object;
+    }
+
+    @Override
+    public void generate(LIRGeneratorTool generator) {
+        // Nothing to do, virtual object states are processed as part of the handling of StateSplit nodes.
+    }
+
+    @Override
+    public abstract EscapeObjectState duplicateWithVirtualState();
+
+    @Override
+    public boolean isPartOfThisState(VirtualState state) {
+        return this == state;
+    }
+
+    @Override
+    public void applyToVirtual(VirtualClosure closure) {
+        closure.apply(this);
+    }
+}
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/MaterializedObjectState.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/MaterializedObjectState.java	Tue Aug 28 14:58:55 2012 +0200
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2009, 2012, 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.nodes.virtual;
+
+import com.oracle.graal.graph.*;
+import com.oracle.graal.nodes.*;
+import com.oracle.graal.nodes.spi.*;
+
+/**
+ * This class encapsulated the materialized state of an escape analyzed object.
+ */
+public final class MaterializedObjectState extends EscapeObjectState implements Node.IterableNodeType, LIRLowerable {
+
+    @Input private ValueNode materializedValue;
+
+    public ValueNode materializedValue() {
+        return materializedValue;
+    }
+
+    public MaterializedObjectState(VirtualObjectNode object, ValueNode materializedValue) {
+        super(object);
+        this.materializedValue = materializedValue;
+    }
+
+    @Override
+    public void generate(LIRGeneratorTool generator) {
+        // Nothing to do, virtual object states are processed as part of the handling of StateSplit nodes.
+    }
+
+    @Override
+    public MaterializedObjectState duplicateWithVirtualState() {
+        return graph().add(new MaterializedObjectState(object(), materializedValue));
+    }
+
+    @Override
+    public void applyToNonVirtual(NodeClosure< ? super ValueNode> closure) {
+        closure.apply(this, materializedValue);
+    }
+}
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java	Tue Aug 28 14:58:55 2012 +0200
@@ -30,19 +30,14 @@
 @NodeInfo(nameTemplate = "VirtualObject {p#type}")
 public class VirtualObjectNode extends FloatingNode implements LIRLowerable {
 
-    private ResolvedJavaType type;
-    private EscapeField[] fields;
-    private int fieldsCount;
+    @SuppressWarnings("unused")
+    private final int id;
+    private final ResolvedJavaType type;
+    private final int fieldsCount;
 
-    public VirtualObjectNode(ResolvedJavaType type, EscapeField[] fields) {
+    public VirtualObjectNode(int id, ResolvedJavaType type, int fieldCount) {
         super(StampFactory.virtual());
-        this.type = type;
-        this.fields = fields;
-        this.fieldsCount = fields.length;
-    }
-
-    public VirtualObjectNode(ResolvedJavaType type, int fieldCount) {
-        super(StampFactory.virtual());
+        this.id = id;
         this.type = type;
         this.fieldsCount = fieldCount;
     }
@@ -51,10 +46,6 @@
         return type;
     }
 
-    public EscapeField[] fields() {
-        return fields;
-    }
-
     @Override
     public void generate(LIRGeneratorTool gen) {
         // nothing to do...
diff -r 1ed726759f65 -r 6a51bc216306 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectState.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectState.java	Tue Aug 28 14:04:55 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectState.java	Tue Aug 28 14:58:55 2012 +0200
@@ -31,28 +31,23 @@
 /**
  * This class encapsulated the virtual state of an escape analyzed object.
  */
-public final class VirtualObjectState extends VirtualState implements Node.IterableNodeType, LIRLowerable {
+public final class VirtualObjectState extends EscapeObjectState implements Node.IterableNodeType, LIRLowerable {
 
-    @Input private VirtualObjectNode object;
     @Input private NodeInputList<ValueNode> fieldValues;
 
-    public VirtualObjectNode object() {
-        return object;
-    }
-
     public NodeInputList<ValueNode> fieldValues() {
         return fieldValues;
     }
 
     public VirtualObjectState(VirtualObjectNode object, ValueNode[] fieldValues) {
+        super(object);
         assert object.fieldsCount() == fieldValues.length;
-        this.object = object;
         this.fieldValues = new NodeInputList<>(this, fieldValues);
     }
 
     private VirtualObjectState(VirtualObjectNode object, List<ValueNode> fieldValues) {
+        super(object);
         assert object.fieldsCount() == fieldValues.size();
-        this.object = object;
         this.fieldValues = new NodeInputList<>(this, fieldValues);
     }
 
@@ -63,7 +58,7 @@
 
     @Override
     public VirtualObjectState duplicateWithVirtualState() {
-        return graph().add(new VirtualObjectState(object, fieldValues));
+        return graph().add(new VirtualObjectState(object(), fieldValues));
     }
 
     @Override
@@ -72,14 +67,4 @@
             closure.apply(this, value);
         }
     }
-
-    @Override
-    public boolean isPartOfThisState(VirtualState state) {
-        return this == state;
-    }
-
-    @Override
-    public void applyToVirtual(VirtualClosure closure) {
-        closure.apply(this);
-    }
 }
diff -r 1ed726759f65 -r 6a51bc216306 mx/commands.py
--- a/mx/commands.py	Tue Aug 28 14:04:55 2012 +0200
+++ b/mx/commands.py	Tue Aug 28 14:58:55 2012 +0200
@@ -79,7 +79,7 @@
 """
 
 def clean(args):
-    """cleans the GraalVM source tree"""
+    """clean the GraalVM source tree"""
     opts = mx.clean(args, parser=ArgumentParser(prog='mx clean'))
     if opts.native:
         os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='16')
@@ -396,7 +396,7 @@
     return ret
 
 def jdkhome(args, vm=None):
-    """prints the JDK directory selected for the 'vm' command"""
+    """print the JDK directory selected for the 'vm' command"""
 
     build = _vmbuild if _vmSourcesAvailable else 'product'
     print join(_graal_home, 'jdk' + mx.java().version, build)
@@ -582,7 +582,7 @@
         # Exclude all compiler tests and snippets
         excludes = ['com.oracle.graal.compiler.tests.*', 'com.oracle.graal.jtt.*']
         for p in mx.projects():
-            excludes += _find_classes_with_annotations(p, None, ['@Snippet', '@ClassSubstitution'], includeInnerClasses=True)
+            excludes += _find_classes_with_annotations(p, None, ['@Snippet', '@ClassSubstitution', '@Test'], includeInnerClasses=True)
             excludes += p.find_classes_with_matching_source_line(None, lambda line: 'JaCoCo Exclude' in line, includeInnerClasses=True)
             
         includes = ['com.oracle.graal.*', 'com.oracle.max.*']
@@ -608,7 +608,7 @@
     matches = lambda line : len([a for a in annotations if line == a or line.startswith(a + '(')]) != 0
     return p.find_classes_with_matching_source_line(pkgRoot, matches, includeInnerClasses)
 
-def _run_tests(args, harnessName, harness):
+def _run_tests(args, harness):
     pos = [a for a in args if a[0] != '-' and a[0] != '@' ]
     neg = [a[1:] for a in args if a[0] == '-']
     vmArgs = [a[1:] for a in args if a[0] == '@']
@@ -620,39 +620,34 @@
         return False
 
     for p in mx.projects():
-        if getattr(p, 'testHarness', None) == harnessName:
-            classes = _find_classes_with_annotations(p, None, ['@Test'])
+        classes = _find_classes_with_annotations(p, None, ['@Test'])
 
-            if len(pos) != 0:
-                classes = [c for c in classes if containsAny(c, pos)]
-            if len(neg) != 0:
-                classes = [c for c in classes if not containsAny(c, neg)]
+        if len(pos) != 0:
+            classes = [c for c in classes if containsAny(c, pos)]
+        if len(neg) != 0:
+            classes = [c for c in classes if not containsAny(c, neg)]
 
-            if len(classes) != 0:
-                mx.log('running tests in ' + p.name)
-                harness(p, vmArgs, classes)
+        if len(classes) != 0:
+            mx.log('running tests in ' + p.name)
+            harness(p, vmArgs, classes)
 
 def unittest(args):
-    """run the Graal Compiler Unit Tests in the GraalVM
+    """run the JUnit tests
 
     If filters are supplied, only tests whose fully qualified name
     include a filter as a substring are run. Negative filters are
     those with a '-' prefix. VM args should have a @ prefix."""
 
     def harness(p, vmArgs, classes):
-        vm(['-XX:-BootstrapGraal', '-esa'] + vmArgs + ['-cp', mx.classpath(p.name), 'org.junit.runner.JUnitCore'] + classes)
-    _run_tests(args, 'unittest', harness)
-
-def jtt(args):
-    """run the Java Tester Tests in the GraalVM
-
-    If filters are supplied, only tests whose fully qualified name
-    include a filter as a substring are run. Negative filters are
-    those with a '-' prefix. VM args should have a @ prefix."""
-
-    def harness(p, vmArgs, classes):
-        vm(['-XX:-BootstrapGraal', '-XX:CompileOnly=com/oracle/graal/jtt', '-XX:CompileCommand=compileonly,java/lang/Object::<init>', '-XX:CompileCommand=quiet', '-Xcomp', '-esa'] + vmArgs + ['-cp', mx.classpath(p.name), 'org.junit.runner.JUnitCore'] + classes)
-    _run_tests(args, 'jtt', harness)
+        prefixArgs = ['-XX:-BootstrapGraal', '-esa']
+        if p.name.endswith('.jtt'):
+            prefixArgs = prefixArgs + [
+                '-XX:CompileOnly=com/oracle/graal/jtt',
+                '-XX:CompileCommand=compileonly,java/lang/Object::<init>',
+                '-XX:CompileCommand=quiet',
+                '-Xcomp']
+        vm(prefixArgs + vmArgs + ['-cp', mx.classpath(p.name), 'org.junit.runner.JUnitCore'] + classes)
+    _run_tests(args, harness)
 
 def buildvms(args):
     """build one or more VMs in various configurations"""
@@ -753,11 +748,7 @@
             tasks.append(t.stop())
 
             t = Task('UnitTests:' + vmbuild)
-            unittest([])
-            tasks.append(t.stop())
-
-            t = Task('JavaTesterTests:' + vmbuild)
-            jtt(['@-XX:CompileCommand=exclude,*::run*'] if vmbuild == 'product'  else [])
+            unittest(['@-XX:CompileCommand=exclude,*::run*'] if vmbuild == 'product'  else [])
             tasks.append(t.stop())
 
             for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild):
@@ -935,7 +926,7 @@
     sanitycheck.getSPECjvm2008(benchArgs, skipValid, wt, it).bench(vm, opts=vmArgs)
 
 def hsdis(args, copyToDir=None):
-    """downloads the hsdis library
+    """download the hsdis library
 
     This is needed to support HotSpot's assembly dumping features.
     By default it downloads the Intel syntax version, use the 'att' argument to install AT&T syntax."""
@@ -950,7 +941,7 @@
         shutil.copy(path, copyToDir)
 
 def hcfdis(args):
-    """disassembles HexCodeFiles embedded in text files
+    """disassemble HexCodeFiles embedded in text files
 
     Run a tool over the input files to convert all embedded HexCodeFiles
     to a disassembled format."""
@@ -960,7 +951,7 @@
     mx.run_java(['-jar', path] + args)
 
 def jacocoreport(args):
-    """creates a JaCoCo coverage report
+    """create a JaCoCo coverage report
 
     Creates the report from the 'jacoco.exec' file in the current directory.
     Default output directory is 'coverage', but an alternative can be provided as an argument."""
@@ -973,7 +964,7 @@
     mx.run_java(['-jar', jacocoreport.get_path(True), '-in', 'jacoco.exec', '-g', join(_graal_home, 'graal'), out])
 
 def site(args):
-    """creates a website containing javadoc and the project dependency graph"""
+    """create a website containing javadoc and the project dependency graph"""
 
     return mx.site(['--name', 'Graal',
                     '--jd', '@-tag', '--jd', '@test:X',
@@ -1003,7 +994,6 @@
         'gv' : [gv, ''],
         'bench' : [bench, '[-resultfile file] [all(default)|dacapo|specjvm2008|bootstrap]'],
         'unittest' : [unittest, '[filters...]'],
-        'jtt' : [jtt, '[filters...]'],
         'jacocoreport' : [jacocoreport, '[output directory]'],
         'site' : [site, '[-options]'],
         'vm': [vm, '[-options] class [args...]'],
diff -r 1ed726759f65 -r 6a51bc216306 mx/projects
--- a/mx/projects	Tue Aug 28 14:04:55 2012 +0200
+++ b/mx/projects	Tue Aug 28 14:58:55 2012 +0200
@@ -122,7 +122,6 @@
 project@com.oracle.graal.snippets.test@dependencies=com.oracle.graal.snippets,com.oracle.graal.tests
 project@com.oracle.graal.snippets.test@checkstyle=com.oracle.graal.graph
 project@com.oracle.graal.snippets.test@javaCompliance=1.7
-project@com.oracle.graal.snippets.test@testHarness=unittest
 
 # graal.nodes
 project@com.oracle.graal.nodes@subDir=graal
@@ -185,7 +184,6 @@
 project@com.oracle.graal.tests@dependencies=JUNIT,com.oracle.graal.printer,com.oracle.graal.api
 project@com.oracle.graal.tests@checkstyle=com.oracle.graal.graph
 project@com.oracle.graal.tests@javaCompliance=1.7
-project@com.oracle.graal.tests@testHarness=unittest
 
 # graal.jtt
 project@com.oracle.graal.jtt@subDir=graal
@@ -193,7 +191,6 @@
 project@com.oracle.graal.jtt@dependencies=JUNIT
 project@com.oracle.graal.jtt@checkstyle=com.oracle.graal.graph
 project@com.oracle.graal.jtt@javaCompliance=1.7
-project@com.oracle.graal.jtt@testHarness=jtt
 
 # graal.examples
 project@com.oracle.graal.examples@subDir=graal