Mercurial > hg > truffle
diff src/share/vm/gc_implementation/g1/g1RemSet.cpp @ 6725:da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>
| author | coleenp |
|---|---|
| date | Sat, 01 Sep 2012 13:25:18 -0400 |
| parents | bb3f6194fedb |
| children | 5c93c1f61226 |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1RemSet.cpp Fri Aug 31 16:39:35 2012 -0700 +++ b/src/share/vm/gc_implementation/g1/g1RemSet.cpp Sat Sep 01 13:25:18 2012 -0400 @@ -380,7 +380,10 @@ assert(r != NULL, "unexpected null"); // Scan oops in the card looking for references into the collection set - HeapWord* end = _ct_bs->addr_for(card_ptr + 1); + // Don't use addr_for(card_ptr + 1) which can ask for + // a card beyond the heap. This is not safe without a perm + // gen. + HeapWord* end = start + CardTableModRefBS::card_size_in_words; MemRegion scanRegion(start, end); UpdateRSetImmediate update_rs_cl(_g1->g1_rem_set()); @@ -530,7 +533,10 @@ HeapRegion* r = _g1->heap_region_containing(start); assert(r != NULL, "unexpected null"); - HeapWord* end = _ct_bs->addr_for(card_ptr + 1); + // Don't use addr_for(card_ptr + 1) which can ask for + // a card beyond the heap. This is not safe without a perm + // gen at the upper end of the heap. + HeapWord* end = start + CardTableModRefBS::card_size_in_words; MemRegion dirtyRegion(start, end); #if CARD_REPEAT_HISTO @@ -622,7 +628,6 @@ // And find the region containing it. HeapRegion* r = _g1->heap_region_containing(start); if (r == NULL) { - guarantee(_g1->is_in_permanent(start), "Or else where?"); // Again no need to return that this card contains refs that // point into the collection set. return false; // Not in the G1 heap (might be in perm, for example.) @@ -706,9 +711,7 @@ if (res != NULL && (res != card_ptr || defer)) { start = _ct_bs->addr_for(res); r = _g1->heap_region_containing(start); - if (r == NULL) { - assert(_g1->is_in_permanent(start), "Or else where?"); - } else { + if (r != NULL) { // Checking whether the region we got back from the cache // is young here is inappropriate. The region could have been // freed, reallocated and tagged as young while in the cache.