Mercurial > hg > graal-jvmci-8
diff src/share/vm/c1x/c1x_Compiler.cpp @ 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 | ad9b14650e15 |
line wrap: on
line diff
--- a/src/share/vm/c1x/c1x_Compiler.cpp Fri Apr 22 15:30:53 2011 +0200 +++ b/src/share/vm/c1x/c1x_Compiler.cpp Fri Apr 22 19:00:07 2011 +0200 @@ -137,9 +137,8 @@ Handle field_name = VmIds::toString<Handle>(field->name()->get_symbol(), CHECK_0); Handle field_holder = get_RiType(field->holder(), accessor, CHECK_0); Handle field_type = get_RiType(field->type(), accessor, CHECK_0); - - // TODO: implement caching - return VMExits::createRiField(field_holder, field_name, field_type, offset, THREAD); + int flags = field->flags().as_int(); + return VMExits::createRiField(field_holder, field_name, field_type, offset, flags, THREAD); } oop C1XCompiler::createHotSpotTypeResolved(KlassHandle klass, Handle name, TRAPS) {