infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-26 13:27:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

7021322: assert(object_end <= top()) failed: Object crosses promotion LAB boundary

Browse Source 
Pass the same object size value to both allocate and unallocate_object

Reviewed-by: ysr, brutisso
This commit is contained in:
Stefan Karlsson 2011-09-12 16:09:50 +02:00
parent 75685a273a
commit a4523cfc7f
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp
View File

@ -102,17 +102,15 @@ void PSPromotionLAB::flush() {
_state = flushed;
}
bool PSPromotionLAB::unallocate_object(oop obj) {
bool PSPromotionLAB::unallocate_object(HeapWord* obj, size_t obj_size) {
assert(Universe::heap()->is_in(obj), "Object outside heap");
if (contains(obj)) {
HeapWord* object_end = (HeapWord*)obj + obj->size();
assert(object_end <= top(), "Object crosses promotion LAB boundary");
HeapWord* object_end = obj + obj_size;
assert(object_end == top(), "Not matching last allocation");
if (object_end == top()) {
set_top((HeapWord*)obj);
return true;
}
set_top(obj);
return true;
}
return false;

2
hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
View File

@ -73,7 +73,7 @@ class PSPromotionLAB : public CHeapObj {
bool is_flushed() { return _state == flushed; }
bool unallocate_object(oop obj);
bool unallocate_object(HeapWord* obj, size_t obj_size);
// Returns a subregion containing all objects in this space.
MemRegion used_region() { return MemRegion(bottom(), top()); }

4
hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
View File

@ -380,10 +380,10 @@ oop PSPromotionManager::copy_to_survivor_space(oop o) {
// deallocate it, so we have to test. If the deallocation fails,
// overwrite with a filler object.
if (new_obj_is_tenured) {
if (!_old_lab.unallocate_object(new_obj)) {
if (!_old_lab.unallocate_object((HeapWord*) new_obj, new_obj_size)) {
CollectedHeap::fill_with_object((HeapWord*) new_obj, new_obj_size);
}
} else if (!_young_lab.unallocate_object(new_obj)) {
} else if (!_young_lab.unallocate_object((HeapWord*) new_obj, new_obj_size)) {
CollectedHeap::fill_with_object((HeapWord*) new_obj, new_obj_size);
}