Mercurial > hg > graal-compiler
diff src/share/vm/interpreter/linkResolver.hpp @ 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 | b2e698d2276c |
| children | 096c224171c4 |
line wrap: on
line diff
--- a/src/share/vm/interpreter/linkResolver.hpp Fri Oct 11 10:38:03 2013 +0200 +++ b/src/share/vm/interpreter/linkResolver.hpp Fri Oct 11 15:41:33 2013 +0200 @@ -161,6 +161,7 @@ // runtime/static resolving for fields static void resolve_field_access(fieldDescriptor& result, constantPoolHandle pool, int index, Bytecodes::Code byte, TRAPS); + static void resolve_field_access(fieldDescriptor& result, constantPoolHandle pool, int index, Bytecodes::Code byte, bool check_access, bool initialize_class, TRAPS); static void resolve_field(fieldDescriptor& result, KlassHandle resolved_klass, Symbol* field_name, Symbol* field_signature, KlassHandle current_klass, Bytecodes::Code access_kind, bool check_access, bool initialize_class, TRAPS);