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

*** 34,43 ****
--- 34,44 ----
  #include "gc/g1/g1HeapVerifier.hpp"
  #include "gc/g1/g1OopClosures.inline.hpp"
  #include "gc/g1/g1Policy.hpp"
  #include "gc/g1/g1RegionMarkStatsCache.inline.hpp"
  #include "gc/g1/g1StringDedup.hpp"
+ #include "gc/g1/g1ThreadLocalData.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
  #include "gc/g1/heapRegionSet.inline.hpp"
  #include "gc/shared/adaptiveSizePolicy.hpp"
  #include "gc/shared/gcId.hpp"
*** 1690,1700 ****
          // * Weakly reachable otherwise
          // Some objects reachable from nmethods, such as the class loader (or klass_holder) of the receiver should be
          // live by the SATB invariant but other oops recorded in nmethods may behave differently.
          jt->nmethods_do(&_code_cl);
  
!         jt->satb_mark_queue().apply_closure_and_empty(&_cm_satb_cl);
        }
      } else if (thread->is_VM_thread()) {
        if (thread->claim_oops_do(true, _thread_parity)) {
          G1BarrierSet::satb_mark_queue_set().shared_satb_queue()->apply_closure_and_empty(&_cm_satb_cl);
        }
--- 1691,1701 ----
          // * Weakly reachable otherwise
          // Some objects reachable from nmethods, such as the class loader (or klass_holder) of the receiver should be
          // live by the SATB invariant but other oops recorded in nmethods may behave differently.
          jt->nmethods_do(&_code_cl);
  
!         G1ThreadLocalData::satb_mark_queue(jt).apply_closure_and_empty(&_cm_satb_cl);
        }
      } else if (thread->is_VM_thread()) {
        if (thread->claim_oops_do(true, _thread_parity)) {
          G1BarrierSet::satb_mark_queue_set().shared_satb_queue()->apply_closure_and_empty(&_cm_satb_cl);
        }