src/share/vm/gc/g1/g1RootProcessor.cpp

rev 12906 : [mq]: gc_interface

*** 27,36 ****
--- 27,37 ----
  #include "aot/aotLoader.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
  #include "gc/g1/bufferingOopClosure.hpp"
+ #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CodeBlobClosure.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectorState.hpp"
  #include "gc/g1/g1GCPhaseTimes.hpp"
  #include "gc/g1/g1Policy.hpp"
*** 131,141 ****
    // to make sure we remove any oops into the CSet (which will show up
    // as implicitly live).
    {
      G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::SATBFiltering, worker_i);
      if (!_process_strong_tasks.is_task_claimed(G1RP_PS_filter_satb_buffers) && _g1h->collector_state()->mark_in_progress()) {
!       JavaThread::satb_mark_queue_set().filter_thread_buffers();
      }
    }
  
    _process_strong_tasks.all_tasks_completed(n_workers());
  }
--- 132,142 ----
    // to make sure we remove any oops into the CSet (which will show up
    // as implicitly live).
    {
      G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::SATBFiltering, worker_i);
      if (!_process_strong_tasks.is_task_claimed(G1RP_PS_filter_satb_buffers) && _g1h->collector_state()->mark_in_progress()) {
!       G1BarrierSet::satb_mark_queue_set().filter_thread_buffers();
      }
    }
  
    _process_strong_tasks.all_tasks_completed(n_workers());
  }