src/hotspot/share/gc/g1/vm_operations_g1.cpp

*** 41,55 ****
  
  VM_G1CollectForAllocation::VM_G1CollectForAllocation(size_t         word_size,
                                                       uint           gc_count_before,
                                                       GCCause::Cause gc_cause,
                                                       bool           should_initiate_conc_mark,
!                                                      double         target_pause_time_ms,
!                                                      AllocationContext_t allocation_context)
    : 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),
      _old_marking_cycles_completed_before(0) {
    guarantee(target_pause_time_ms > 0.0,
--- 41,53 ----
  
  VM_G1CollectForAllocation::VM_G1CollectForAllocation(size_t         word_size,
                                                       uint           gc_count_before,
                                                       GCCause::Cause gc_cause,
                                                       bool           should_initiate_conc_mark,
!                                                      double         target_pause_time_ms)
    : VM_CollectForAllocation(word_size, gc_count_before, gc_cause),
      _pause_succeeded(false),
      _should_initiate_conc_mark(should_initiate_conc_mark),
      _target_pause_time_ms(target_pause_time_ms),
      _should_retry_gc(false),
      _old_marking_cycles_completed_before(0) {
    guarantee(target_pause_time_ms > 0.0,
*** 80,90 ****
        "only a GC locker, a System.gc(), stats update, whitebox, or a hum allocation induced GC should start a cycle");
  
    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
        // pause then we will consider this pause successful.
        _pause_succeeded = true;
--- 78,87 ----
*** 136,146 ****
  
    if (_pause_succeeded) {
      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);
      } else {
        bool should_upgrade_to_full = !g1h->should_do_concurrent_full_gc(_gc_cause) &&
                                      !g1h->has_regions_left_for_allocation();
        if (should_upgrade_to_full) {
          // There has been a request to perform a GC to free some space. We have no
--- 133,143 ----
  
    if (_pause_succeeded) {
      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, &_pause_succeeded);
      } else {
        bool should_upgrade_to_full = !g1h->should_do_concurrent_full_gc(_gc_cause) &&
                                      !g1h->has_regions_left_for_allocation();
        if (should_upgrade_to_full) {
          // There has been a request to perform a GC to free some space. We have no