Mercurial > hg > graal-compiler
diff src/share/vm/interpreter/linkResolver.cpp @ 12356:359f7e70ae7f
Reduce HotSpot diff and fix previous merge
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Fri, 11 Oct 2013 15:41:33 +0200 |
| parents | 36b97be47bde |
| children | 096c224171c4 |
line wrap: on
line diff
--- a/src/share/vm/interpreter/linkResolver.cpp Fri Oct 11 10:38:03 2013 +0200 +++ b/src/share/vm/interpreter/linkResolver.cpp Fri Oct 11 15:41:33 2013 +0200 @@ -656,6 +656,10 @@ } void LinkResolver::resolve_field_access(fieldDescriptor& result, constantPoolHandle pool, int index, Bytecodes::Code byte, TRAPS) { + resolve_field_access(result, pool, index, byte, true, true, THREAD); +} + +void LinkResolver::resolve_field_access(fieldDescriptor& result, constantPoolHandle pool, int index, Bytecodes::Code byte, bool check_access, bool initialize_class, TRAPS) { // Load these early in case the resolve of the containing klass fails Symbol* field = pool->name_ref_at(index); Symbol* sig = pool->signature_ref_at(index); @@ -665,7 +669,7 @@ resolve_klass(resolved_klass, pool, index, CHECK); KlassHandle current_klass(THREAD, pool->pool_holder()); - resolve_field(result, resolved_klass, field, sig, current_klass, byte, true, true, CHECK); + resolve_field(result, resolved_klass, field, sig, current_klass, byte, check_access, initialize_class, CHECK); } void LinkResolver::resolve_field(fieldDescriptor& fd, KlassHandle resolved_klass, Symbol* field, Symbol* sig,