Merge
This commit is contained in:
commit
b34dec66c6
@ -2702,9 +2702,11 @@ void CMSCollector::setup_cms_unloading_and_verification_state() {
|
|||||||
// Not unloading classes this cycle
|
// Not unloading classes this cycle
|
||||||
assert(!should_unload_classes(), "Inconsistency!");
|
assert(!should_unload_classes(), "Inconsistency!");
|
||||||
|
|
||||||
|
// If we are not unloading classes then add SO_AllCodeCache to root
|
||||||
|
// scanning options.
|
||||||
|
add_root_scanning_option(rso);
|
||||||
|
|
||||||
if ((!verifying() || unloaded_classes_last_cycle()) && should_verify) {
|
if ((!verifying() || unloaded_classes_last_cycle()) && should_verify) {
|
||||||
// Include symbols, strings and code cache elements to prevent their resurrection.
|
|
||||||
add_root_scanning_option(rso);
|
|
||||||
set_verifying(true);
|
set_verifying(true);
|
||||||
} else if (verifying() && !should_verify) {
|
} else if (verifying() && !should_verify) {
|
||||||
// We were verifying, but some verification flags got disabled.
|
// We were verifying, but some verification flags got disabled.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user