diff graal/Runtime/src/com/sun/hotspot/c1x/HotSpotTypeResolved.java @ 2492:4e5515d09314

Fixed merge issues. - Accessing static fields from the java.lang.Class object instead of the klassOop (1-line-change) - Fixed issue with RiField object caching (the caching was only taking the offset as a field ID, but need to take offset+is_static)
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 22 Apr 2011 19:00:07 +0200
parents 099e697d8934
children
line wrap: on
line diff
--- a/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotTypeResolved.java	Fri Apr 22 15:30:53 2011 +0200
+++ b/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotTypeResolved.java	Fri Apr 22 19:00:07 2011 +0200
@@ -31,6 +31,6 @@
 
     int instanceSize();
 
-    RiField createRiField(String name, RiType type, int offset);
+    RiField createRiField(String name, RiType type, int offset, int flags);
 
 }
\ No newline at end of file