Mercurial > hg > truffle

changeset 14047:fde464340755

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't allow unresolved field types to hang around
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Fri, 28 Feb 2014 16:35:52 -0800
parents 8b23db5f4164
children d2c84a0bf37a
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
     }