archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6786346: intermittent Internal Error (src/share/vm/memory/cardTableModRefBS.cpp:226)

Browse source 
Two assertions were incorrectly composed.

Reviewed-by: tonyp
This commit is contained in:
Jon Masamitsu 2009-02-17 15:35:58 -08:00
parent a7da5440dd
commit f1847266b7
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hotspot/src/share/vm/memory/cardTableModRefBS.cpp
View file

@ -217,15 +217,28 @@ void CardTableModRefBS::resize_covered_region(MemRegion new_region) {
(HeapWord*) align_size_up((uintptr_t)new_end, _page_size); (HeapWord*) align_size_up((uintptr_t)new_end, _page_size);
assert(new_end_aligned >= (HeapWord*) new_end, assert(new_end_aligned >= (HeapWord*) new_end,
"align up, but less"); "align up, but less");
// Check the other regions (excludes "ind") to ensure that
// the new_end_aligned does not intrude onto the committed
// space of another region.
int ri = 0; int ri = 0;
for (ri = 0; ri < _cur_covered_regions; ri++) { for (ri = 0; ri < _cur_covered_regions; ri++) {
if (ri != ind) { if (ri != ind) {
if (_committed[ri].contains(new_end_aligned)) { if (_committed[ri].contains(new_end_aligned)) {
assert((new_end_aligned >= _committed[ri].start()) && // The prior check included in the assert
(_committed[ri].start() > _committed[ind].start()), // (new_end_aligned >= _committed[ri].start())
// is redundant with the "contains" test.
// Any region containing the new end
// should start at or beyond the region found (ind)
// for the new end (committed regions are not expected to
// be proper subsets of other committed regions).
assert(_committed[ri].start() >= _committed[ind].start(),
"New end of committed region is inconsistent"); "New end of committed region is inconsistent");
new_end_aligned = _committed[ri].start(); new_end_aligned = _committed[ri].start();
assert(new_end_aligned > _committed[ind].start(), // new_end_aligned can be equal to the start of its
// committed region (i.e., of "ind") if a second
// region following "ind" also start at the same location
// as "ind".
assert(new_end_aligned >= _committed[ind].start(),
"New end of committed region is before start"); "New end of committed region is before start");
debug_only(collided = true;) debug_only(collided = true;)
// Should only collide with 1 region // Should only collide with 1 region