1.1 --- a/src/share/vm/oops/instanceRefKlass.cpp Mon Aug 24 13:52:42 2009 -0700
1.2 +++ b/src/share/vm/oops/instanceRefKlass.cpp Tue Aug 11 15:37:23 2009 -0700
1.3 @@ -400,26 +400,26 @@
1.4 assert(k == SystemDictionary::reference_klass() && first_time,
1.5 "Invalid update of maps");
1.6 debug_only(first_time = false);
1.7 - assert(ik->nonstatic_oop_map_size() == 1, "just checking");
1.8 + assert(ik->nonstatic_oop_map_count() == 1, "just checking");
1.9
1.10 OopMapBlock* map = ik->start_of_nonstatic_oop_maps();
1.11
1.12 // Check that the current map is (2,4) - currently points at field with
1.13 // offset 2 (words) and has 4 map entries.
1.14 debug_only(int offset = java_lang_ref_Reference::referent_offset);
1.15 - debug_only(int length = ((java_lang_ref_Reference::discovered_offset -
1.16 + debug_only(int count = ((java_lang_ref_Reference::discovered_offset -
1.17 java_lang_ref_Reference::referent_offset)/heapOopSize) + 1);
1.18
1.19 if (UseSharedSpaces) {
1.20 assert(map->offset() == java_lang_ref_Reference::queue_offset &&
1.21 - map->length() == 1, "just checking");
1.22 + map->count() == 1, "just checking");
1.23 } else {
1.24 - assert(map->offset() == offset && map->length() == length,
1.25 + assert(map->offset() == offset && map->count() == count,
1.26 "just checking");
1.27
1.28 // Update map to (3,1) - point to offset of 3 (words) with 1 map entry.
1.29 map->set_offset(java_lang_ref_Reference::queue_offset);
1.30 - map->set_length(1);
1.31 + map->set_count(1);
1.32 }
1.33 }
1.34
