8323629: Shenandoah: Fix missing include and declaration

Reviewed-by: ysr, kdnilsen, phh
This commit is contained in:
William Kemper 2024-01-12 17:04:51 +00:00 committed by Paul Hohensee
parent c5e7245096
commit e33031b850
3 changed files with 18 additions and 5 deletions

@ -112,11 +112,15 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
ShenandoahBreakpointMarkScope breakpoint_mark_scope(cause);
// Concurrent mark roots
entry_mark_roots();
if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_outside_cycle)) return false;
if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_outside_cycle)) {
return false;
}
// Continue concurrent mark
entry_mark();
if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_mark)) return false;
if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_mark)) {
return false;
}
}
// Complete marking under STW, and start evacuation
@ -161,16 +165,22 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
if (heap->is_evacuation_in_progress()) {
// Concurrently evacuate
entry_evacuate();
if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_evac)) return false;
if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_evac)) {
return false;
}
// Perform update-refs phase.
vmop_entry_init_updaterefs();
entry_updaterefs();
if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_updaterefs)) return false;
if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_updaterefs)) {
return false;
}
// Concurrent update thread roots
entry_update_thread_roots();
if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_updaterefs)) return false;
if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_updaterefs)) {
return false;
}
vmop_entry_final_updaterefs();

@ -27,6 +27,7 @@
#include "gc/shenandoah/shenandoahNumberSeq.hpp"
#include "gc/shenandoah/shenandoahPadding.hpp"
#include "gc/shenandoah/shenandoahSharedVariables.hpp"
#include "memory/allocation.hpp"
class ShenandoahHeap;

@ -34,6 +34,8 @@
#include "runtime/mutex.hpp"
#include "utilities/debug.hpp"
class ShenandoahHeap;
template<class E, MEMFLAGS F, unsigned int N = TASKQUEUE_SIZE>
class BufferedOverflowTaskQueue: public OverflowTaskQueue<E, F, N>
{