# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1346145982 -7200
# Node ID b9e65869ceffcc0cb9411904ae85f40ccac14b9b
# Parent  d7aec4f15658ee1a71182d097342a7d4710046ad
fix to new escape analysis infrastructure

diff -r d7aec4f15658 -r b9e65869ceff 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 10:56:35 2012 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java	Tue Aug 28 11:26:22 2012 +0200
@@ -53,7 +53,6 @@
         FrameState current = topState;
         do {
             for (EscapeObjectState state : current.virtualObjectMappings()) {
-                // null states occur for objects with 0 fields
                 if (objectStates == null) {
                     objectStates = new IdentityHashMap<>();
                 }
@@ -146,7 +145,8 @@
         if (value instanceof VirtualObjectNode) {
             VirtualObjectNode obj = (VirtualObjectNode) value;
             EscapeObjectState state = objectStates.get(obj);
-            if (state == null) {
+            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);
             }
             if (state instanceof MaterializedObjectState) {