--- a/src/hotspot/share/gc/g1/vm_operations_g1.cpp Fri Mar 02 10:09:05 2018 +0100
+++ b/src/hotspot/share/gc/g1/vm_operations_g1.cpp Fri Mar 02 10:09:08 2018 +0100
@@ -43,11 +43,9 @@
uint gc_count_before,
GCCause::Cause gc_cause,
bool should_initiate_conc_mark,
- double target_pause_time_ms,
- AllocationContext_t allocation_context)
+ double target_pause_time_ms)
: VM_CollectForAllocation(word_size, gc_count_before, gc_cause),
_pause_succeeded(false),
- _allocation_context(allocation_context),
_should_initiate_conc_mark(should_initiate_conc_mark),
_target_pause_time_ms(target_pause_time_ms),
_should_retry_gc(false),
@@ -82,7 +80,6 @@
if (_word_size > 0) {
// An allocation has been requested. So, try to do that first.
_result = g1h->attempt_allocation_at_safepoint(_word_size,
- _allocation_context,
false /* expect_null_cur_alloc_region */);
if (_result != NULL) {
// If we can successfully allocate before we actually do the
@@ -138,7 +135,7 @@
if (_word_size > 0) {
// An allocation had been requested. Do it, eventually trying a stronger
// kind of GC.
- _result = g1h->satisfy_failed_allocation(_word_size, _allocation_context, &_pause_succeeded);
+ _result = g1h->satisfy_failed_allocation(_word_size, &_pause_succeeded);
} else {
bool should_upgrade_to_full = !g1h->should_do_concurrent_full_gc(_gc_cause) &&
!g1h->has_regions_left_for_allocation();