comparison 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
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
159 static void resolve_method_statically(methodHandle& method_result, KlassHandle& klass_result, 159 static void resolve_method_statically(methodHandle& method_result, KlassHandle& klass_result,
160 Bytecodes::Code code, constantPoolHandle pool, int index, TRAPS); 160 Bytecodes::Code code, constantPoolHandle pool, int index, TRAPS);
161 161
162 // runtime/static resolving for fields 162 // runtime/static resolving for fields
163 static void resolve_field_access(fieldDescriptor& result, constantPoolHandle pool, int index, Bytecodes::Code byte, TRAPS); 163 static void resolve_field_access(fieldDescriptor& result, constantPoolHandle pool, int index, Bytecodes::Code byte, TRAPS);
164 static void resolve_field_access(fieldDescriptor& result, constantPoolHandle pool, int index, Bytecodes::Code byte, bool check_access, bool initialize_class, TRAPS);
164 static void resolve_field(fieldDescriptor& result, KlassHandle resolved_klass, Symbol* field_name, Symbol* field_signature, 165 static void resolve_field(fieldDescriptor& result, KlassHandle resolved_klass, Symbol* field_name, Symbol* field_signature,
165 KlassHandle current_klass, Bytecodes::Code access_kind, bool check_access, bool initialize_class, TRAPS); 166 KlassHandle current_klass, Bytecodes::Code access_kind, bool check_access, bool initialize_class, TRAPS);
166 167
167 // source of access_kind codes: 168 // source of access_kind codes:
168 static Bytecodes::Code field_access_kind(bool is_static, bool is_put) { 169 static Bytecodes::Code field_access_kind(bool is_static, bool is_put) {