archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Dean Long 2015-10-17 19:40:30 -04:00
commit 344a9becee
539 changed files with 51665 additions and 1091 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp
View file

@ -2367,7 +2367,9 @@ bool CMSCollector::verify_after_remark(bool silent) {
// way with the marking information used by GC.
NoRefDiscovery no_discovery(ref_processor());
COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
#if defined(COMPILER2) || INCLUDE_JVMCI
DerivedPointerTableDeactivate dpt_deact;
#endif
// Clear any marks from a previous round
verification_mark_bm()->clear_all();
@ -2984,7 +2986,9 @@ void CMSCollector::checkpointRootsInitialWork() {
}
{
COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
#if defined(COMPILER2) || INCLUDE_JVMCI
DerivedPointerTableDeactivate dpt_deact;
#endif
if (CMSParallelInitialMarkEnabled) {
// The parallel version.
WorkGang* workers = gch->workers();
@ -4313,7 +4317,9 @@ void CMSCollector::checkpointRootsFinalWork() {
}
{
COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
#if defined(COMPILER2) || INCLUDE_JVMCI
DerivedPointerTableDeactivate dpt_deact;
#endif
// Note on the role of the mod union table:
// Since the marker in "markFromRoots" marks concurrently with