Mercurial > hg > truffle
diff src/share/vm/c1x/c1x_VMExits.hpp @ 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 | 34354e2e40a3 |
| children | 3e3e8bd12730 |
line wrap: on
line diff
--- a/src/share/vm/c1x/c1x_VMExits.hpp Fri Apr 22 15:30:53 2011 +0200 +++ b/src/share/vm/c1x/c1x_VMExits.hpp Fri Apr 22 19:00:07 2011 +0200 @@ -52,8 +52,8 @@ // public abstract RiMethod createRiMethodUnresolved(String name, String signature, RiType holder); static oop createRiMethodUnresolved(Handle name, Handle signature, Handle holder, TRAPS); - // public abstract RiField createRiField(RiType holder, String name, RiType type, int offset); - static oop createRiField(Handle holder, Handle name, Handle type, int index, TRAPS); + // public abstract RiField createRiField(RiType holder, String name, RiType type, int flags, int offset); + static oop createRiField(Handle holder, Handle name, Handle type, int index, int flags, TRAPS); // public abstract RiType createRiType(long vmId, String name); static oop createRiType(jlong vmId, Handle name, TRAPS);