1.1 --- a/src/share/vm/oops/cpCacheOop.cpp Sat Sep 10 00:11:04 2011 -0700
1.2 +++ b/src/share/vm/oops/cpCacheOop.cpp Sat Sep 10 17:29:02 2011 -0700
1.3 @@ -128,17 +128,13 @@
1.4 void ConstantPoolCacheEntry::set_field(Bytecodes::Code get_code,
1.5 Bytecodes::Code put_code,
1.6 KlassHandle field_holder,
1.7 - int orig_field_index,
1.8 + int field_index,
1.9 int field_offset,
1.10 TosState field_type,
1.11 bool is_final,
1.12 bool is_volatile) {
1.13 set_f1(field_holder()->java_mirror());
1.14 set_f2(field_offset);
1.15 - // The field index is used by jvm/ti and is the index into fields() array
1.16 - // in holder instanceKlass. This is scaled by instanceKlass::next_offset.
1.17 - assert((orig_field_index % instanceKlass::next_offset) == 0, "wierd index");
1.18 - const int field_index = orig_field_index / instanceKlass::next_offset;
1.19 assert(field_index <= field_index_mask,
1.20 "field index does not fit in low flag bits");
1.21 set_flags(as_flags(field_type, is_final, false, is_volatile, false, false) |
1.22 @@ -149,7 +145,7 @@
1.23 }
1.24
1.25 int ConstantPoolCacheEntry::field_index() const {
1.26 - return (_flags & field_index_mask) * instanceKlass::next_offset;
1.27 + return (_flags & field_index_mask);
1.28 }
1.29
1.30 void ConstantPoolCacheEntry::set_method(Bytecodes::Code invoke_code,
