Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
2491:0654ee04b214 | 2492:4e5515d09314 |
---|---|
50 static oop createRiMethodResolved(jlong vmId, Handle name, TRAPS); | 50 static oop createRiMethodResolved(jlong vmId, Handle name, TRAPS); |
51 | 51 |
52 // public abstract RiMethod createRiMethodUnresolved(String name, String signature, RiType holder); | 52 // public abstract RiMethod createRiMethodUnresolved(String name, String signature, RiType holder); |
53 static oop createRiMethodUnresolved(Handle name, Handle signature, Handle holder, TRAPS); | 53 static oop createRiMethodUnresolved(Handle name, Handle signature, Handle holder, TRAPS); |
54 | 54 |
55 // public abstract RiField createRiField(RiType holder, String name, RiType type, int offset); | 55 // public abstract RiField createRiField(RiType holder, String name, RiType type, int flags, int offset); |
56 static oop createRiField(Handle holder, Handle name, Handle type, int index, TRAPS); | 56 static oop createRiField(Handle holder, Handle name, Handle type, int index, int flags, TRAPS); |
57 | 57 |
58 // public abstract RiType createRiType(long vmId, String name); | 58 // public abstract RiType createRiType(long vmId, String name); |
59 static oop createRiType(jlong vmId, Handle name, TRAPS); | 59 static oop createRiType(jlong vmId, Handle name, TRAPS); |
60 | 60 |
61 // public abstract RiType createRiTypeUnresolved(String name); | 61 // public abstract RiType createRiTypeUnresolved(String name); |