src/hotspot/share/runtime/thread.cpp

*** 2025,2040 ****
                                   _timer_exit_phase4.milliseconds());
    }
  }
  
  #if INCLUDE_ALL_GCS
- // Flush G1-related queues.
- void JavaThread::flush_barrier_queues() {
-   satb_mark_queue().flush();
-   dirty_card_queue().flush();
- }
- 
  void JavaThread::initialize_queues() {
    assert(!SafepointSynchronize::is_at_safepoint(),
           "we should not be at a safepoint");
  
    SATBMarkQueue& satb_queue = satb_mark_queue();
--- 2025,2034 ----
*** 2074,2088 ****
  
    if (UseTLAB) {
      tlab().make_parsable(true);  // retire TLAB, if any
    }
  
! #if INCLUDE_ALL_GCS
!   if (UseG1GC) {
!     flush_barrier_queues();
!   }
! #endif // INCLUDE_ALL_GCS
  
    Threads::remove(this);
    this->smr_delete();
  }
  
--- 2068,2078 ----
  
    if (UseTLAB) {
      tlab().make_parsable(true);  // retire TLAB, if any
    }
  
!   BarrierSet::barrier_set()->flush_deferred_barriers(this);
  
    Threads::remove(this);
    this->smr_delete();
  }