# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1393634152 28800
# Node ID fde464340755d4db5907b086612366f6acc9b1bf
# Parent  8b23db5f4164fe6beb79b22f7b712d54c969731a
don't allow unresolved field types to hang around

diff -r 8b23db5f4164 -r fde464340755 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java	Fri Feb 28 16:35:50 2014 -0800
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java	Fri Feb 28 16:35:52 2014 -0800
@@ -49,7 +49,7 @@
     private static final long serialVersionUID = 7692985878836955683L;
     private final HotSpotResolvedObjectType holder;
     private final String name;
-    private final JavaType type;
+    private JavaType type;
     private final int offset;
     private Constant constant;
 
@@ -289,6 +289,13 @@
 
     @Override
     public JavaType getType() {
+        if (!(type instanceof ResolvedJavaType)) {
+            // Don't allow unresolved types to hang around forever
+            ResolvedJavaType resolved = type.resolve(holder);
+            if (resolved != null) {
+                type = resolved;
+            }
+        }
         return type;
     }