stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8225342: Shenandoah: use COMPILER2_OR_JVMCI macro consistently

Browse Source 
Reviewed-by: zgu
This commit is contained in:
Aleksey Shipilev 2019-06-05 15:19:13 +02:00
parent 5d46bc86b8
commit 9e80843829
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
View File

@ -292,7 +292,7 @@ void ShenandoahConcurrentMark::update_roots(ShenandoahPhaseTimings::Phase root_p
ShenandoahGCPhase phase(root_phase);
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
@ -302,7 +302,7 @@ void ShenandoahConcurrentMark::update_roots(ShenandoahPhaseTimings::Phase root_p
ShenandoahUpdateRootsTask update_roots(&root_updater);
_heap->workers()->run_task(&update_roots);
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
DerivedPointerTable::update_pointers();
#endif
}

4
src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
View File

@ -1067,7 +1067,7 @@ public:
};
void ShenandoahHeap::evacuate_and_update_roots() {
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
assert(ShenandoahSafepoint::is_at_shenandoah_safepoint(), "Only iterate roots while world is stopped");
@ -1078,7 +1078,7 @@ void ShenandoahHeap::evacuate_and_update_roots() {
workers()->run_task(&roots_task);
}
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
DerivedPointerTable::update_pointers();
#endif
}

12
src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp
View File

@ -402,7 +402,7 @@ void ShenandoahTraversalGC::init_traversal_collection() {
assert(_task_queues->is_empty(), "queues must be empty before traversal GC");
TASKQUEUE_STATS_ONLY(_task_queues->reset_taskqueue_stats());
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
@ -414,7 +414,7 @@ void ShenandoahTraversalGC::init_traversal_collection() {
_heap->workers()->run_task(&traversal_task);
}
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
DerivedPointerTable::update_pointers();
#endif
}
@ -571,7 +571,7 @@ void ShenandoahTraversalGC::final_traversal_collection() {
_heap->make_parsable(true);
if (!_heap->cancelled_gc()) {
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
ShenandoahGCPhase phase_work(ShenandoahPhaseTimings::final_traversal_gc_work);
@ -585,7 +585,7 @@ void ShenandoahTraversalGC::final_traversal_collection() {
ShenandoahTaskTerminator terminator(nworkers, task_queues());
ShenandoahFinalTraversalCollectionTask task(&rp, &terminator);
_heap->workers()->run_task(&task);
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
DerivedPointerTable::update_pointers();
#endif
}
@ -706,13 +706,13 @@ public:
};
void ShenandoahTraversalGC::fixup_roots() {
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
ShenandoahRootUpdater rp(_heap->workers()->active_workers(), ShenandoahPhaseTimings::final_traversal_update_roots, true /* update code cache */);
ShenandoahTraversalFixRootsTask update_roots_task(&rp);
_heap->workers()->run_task(&update_roots_task);
#if defined(COMPILER2) || INCLUDE_JVMCI
#if COMPILER2_OR_JVMCI
DerivedPointerTable::update_pointers();
#endif
}