Mercurial > hg > graal-compiler

diff c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeResolved.java @ 1941:79d04223b8a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added caching for resolved types and resolved fields. This is crucial, because the local load elimination will lead to wrong results, if field equality (of two RiField objects with the same object and the same RiType) is not given. The caching makes sure that the default equals implementation is sufficient.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 28 Dec 2010 18:33:26 +0100
parents 71cd4b9610eb
children 177398c6147d
line wrap: on
line diff
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeResolved.java	Mon Dec 27 20:35:47 2010 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeResolved.java	Tue Dec 28 18:33:26 2010 +0100
@@ -21,6 +21,7 @@
 package com.sun.hotspot.c1x;
 
 import java.lang.reflect.*;
+import java.util.*;
 
 import com.sun.cri.ci.*;
 import com.sun.cri.ri.*;
@@ -33,7 +34,6 @@
  */
 public class HotSpotTypeResolved implements HotSpotType {
 
-    private long vmId;
     private Class javaMirror;
     private String name;
     private int accessFlags;
@@ -46,6 +46,7 @@
     private boolean isInterface;
     private int instanceSize;
     private RiType componentType;
+    private HashMap<Integer, RiField> fieldCache;
 
     @Override
     public int accessFlags() {
@@ -61,7 +62,7 @@
 
     @Override
     public RiType componentType() {
-        return Compiler.getVMEntries().RiType_componentType(vmId);
+        return Compiler.getVMEntries().RiType_componentType(this);
     }
 
     @Override
@@ -141,7 +142,7 @@
     @Override
     public boolean isSubtypeOf(RiType other) {
         if (other instanceof HotSpotTypeResolved) {
-            return Compiler.getVMEntries().RiType_isSubtypeOf(vmId, other);
+            return Compiler.getVMEntries().RiType_isSubtypeOf(this, other);
         }
         // No resolved type is a subtype of an unresolved type.
         return false;
@@ -170,7 +171,7 @@
     @Override
     public RiMethod resolveMethodImpl(RiMethod method) {
         assert method instanceof HotSpotMethod;
-        return Compiler.getVMEntries().RiType_resolveMethodImpl(vmId, method.name(), method.signature().asString());
+        return Compiler.getVMEntries().RiType_resolveMethodImpl(this, method.name(), method.signature().asString());
     }
 
     @Override
@@ -179,15 +180,29 @@
     }
 
     public RiConstantPool constantPool() {
-        return Compiler.getVMEntries().RiType_constantPool(vmId);
-    }
-
-    public long getVmId() {
-        return vmId;
+        return Compiler.getVMEntries().RiType_constantPool(this);
     }
 
     public int instanceSize() {
         return instanceSize;
     }
 
+    public RiField createRiField(String name, RiType type, int offset) {
+        RiField result = null;
+
+        // (tw) Must cache the fields, because the local load elimination only works if the objects from two field lookups are equal.
+        if (fieldCache == null) {
+            fieldCache = new HashMap<Integer, RiField>(8);
+        } else {
+            result = fieldCache.get(offset);
+        }
+
+        if (result == null) {
+            result = new HotSpotField(this, name, type, offset);
+            fieldCache.put(offset, result);
+        }
+
+        return result;
+    }
+
 }