Mercurial > hg > truffle
diff src/share/vm/oops/instanceKlassKlass.cpp @ 938:b37c246bf7ce
6861660: OopMapBlock count/size confusion
Reviewed-by: tonyp, iveresov
author | jcoomes |
---|---|
date | Tue, 11 Aug 2009 15:37:23 -0700 |
parents | be93aad57795 |
children | 9eebd3ac74cf |
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlassKlass.cpp Mon Aug 24 13:52:42 2009 -0700 +++ b/src/share/vm/oops/instanceKlassKlass.cpp Tue Aug 11 15:37:23 2009 -0700 @@ -402,9 +402,14 @@ } #endif // SERIALGC -klassOop instanceKlassKlass::allocate_instance_klass(int vtable_len, int itable_len, int static_field_size, - int nonstatic_oop_map_size, ReferenceType rt, TRAPS) { +klassOop +instanceKlassKlass::allocate_instance_klass(int vtable_len, int itable_len, + int static_field_size, + int nonstatic_oop_map_count, + ReferenceType rt, TRAPS) { + const int nonstatic_oop_map_size = + instanceKlass::nonstatic_oop_map_size(nonstatic_oop_map_count); int size = instanceKlass::object_size(align_object_offset(vtable_len) + align_object_offset(itable_len) + static_field_size + nonstatic_oop_map_size); // Allocation @@ -615,9 +620,9 @@ st->print(BULLET"non-static oop maps: "); OopMapBlock* map = ik->start_of_nonstatic_oop_maps(); - OopMapBlock* end_map = map + ik->nonstatic_oop_map_size(); + OopMapBlock* end_map = map + ik->nonstatic_oop_map_count(); while (map < end_map) { - st->print("%d-%d ", map->offset(), map->offset() + heapOopSize*(map->length() - 1)); + st->print("%d-%d ", map->offset(), map->offset() + heapOopSize*(map->count() - 1)); map++; } st->cr();