Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp @ 3293:1f4413413144
7039089: G1: changeset for 7037276 broke heap verification, and related cleanups
Summary: In G1 heap verification, we no longer scan perm to G1-collected heap refs as part of process_strong_roots() but rather in a separate explicit oop iteration over the perm gen. This preserves the original perm card-marks. Added a new assertion in younger_refs_iterate() to catch a simple subcase where the user may have forgotten a prior save_marks() call, as happened in the case of G1's attempt to iterate perm to G1 refs when verifying the heap before exit. The assert was deliberately weakened for ParNew+CMS and will be fixed for that combination in a future CR. Also made some (non-G1) cleanups related to code and comments obsoleted by the migration of Symbols to the native heap.
Reviewed-by: iveresov, jmasa, tonyp
| author | ysr |
|---|---|
| date | Tue, 26 Apr 2011 21:17:24 -0700 |
| parents | b099aaf51bf8 |
| children | 78542e2b5e35 |
comparison
equal
deleted
inserted
replaced
| 3292:c303b3532d4a | 3293:1f4413413144 |
|---|---|
| 3187 res = res && (occupancy() > (double)CMSIsTooFullPercentage/100.0); | 3187 res = res && (occupancy() > (double)CMSIsTooFullPercentage/100.0); |
| 3188 return res; | 3188 return res; |
| 3189 } | 3189 } |
| 3190 | 3190 |
| 3191 void CMSCollector::setup_cms_unloading_and_verification_state() { | 3191 void CMSCollector::setup_cms_unloading_and_verification_state() { |
| 3192 const bool should_verify = VerifyBeforeGC || VerifyAfterGC || VerifyDuringGC | 3192 const bool should_verify = VerifyBeforeGC || VerifyAfterGC || VerifyDuringGC |
| 3193 || VerifyBeforeExit; | 3193 || VerifyBeforeExit; |
| 3194 const int rso = SharedHeap::SO_Symbols | SharedHeap::SO_Strings | 3194 const int rso = SharedHeap::SO_Strings | SharedHeap::SO_CodeCache; |
| 3195 | SharedHeap::SO_CodeCache; | |
| 3196 | 3195 |
| 3197 if (should_unload_classes()) { // Should unload classes this cycle | 3196 if (should_unload_classes()) { // Should unload classes this cycle |
| 3198 remove_root_scanning_option(rso); // Shrink the root set appropriately | 3197 remove_root_scanning_option(rso); // Shrink the root set appropriately |
| 3199 set_verifying(should_verify); // Set verification state for this cycle | 3198 set_verifying(should_verify); // Set verification state for this cycle |
| 3200 return; // Nothing else needs to be done at this time | 3199 return; // Nothing else needs to be done at this time |