src/share/vm/gc/parallel/psTasks.cpp

rev 12906 : [mq]: gc_interface

*** 24,36 ****
  
  #include "precompiled.hpp"
  #include "aot/aotLoader.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
- #include "gc/parallel/cardTableExtension.hpp"
  #include "gc/parallel/gcTaskManager.hpp"
  #include "gc/parallel/psMarkSweep.hpp"
  #include "gc/parallel/psPromotionManager.hpp"
  #include "gc/parallel/psPromotionManager.inline.hpp"
  #include "gc/parallel/psScavenge.inline.hpp"
  #include "gc/parallel/psTasks.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
--- 24,36 ----
  
  #include "precompiled.hpp"
  #include "aot/aotLoader.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
  #include "gc/parallel/gcTaskManager.hpp"
  #include "gc/parallel/psMarkSweep.hpp"
+ #include "gc/parallel/psCardTable.hpp"
  #include "gc/parallel/psPromotionManager.hpp"
  #include "gc/parallel/psPromotionManager.inline.hpp"
  #include "gc/parallel/psScavenge.inline.hpp"
  #include "gc/parallel/psTasks.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
*** 179,190 ****
    assert(_old_gen->object_space()->contains(_gen_top) || _gen_top == _old_gen->object_space()->top(), "Sanity");
    assert(_stripe_number < ParallelGCThreads, "Sanity");
  
    {
      PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(which);
!     CardTableExtension* card_table =
!       barrier_set_cast<CardTableExtension>(ParallelScavengeHeap::heap()->barrier_set());
  
      card_table->scavenge_contents_parallel(_old_gen->start_array(),
                                             _old_gen->object_space(),
                                             _gen_top,
                                             pm,
--- 179,189 ----
    assert(_old_gen->object_space()->contains(_gen_top) || _gen_top == _old_gen->object_space()->top(), "Sanity");
    assert(_stripe_number < ParallelGCThreads, "Sanity");
  
    {
      PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(which);
!     PSCardTable* card_table = ParallelScavengeHeap::heap()->card_table();
  
      card_table->scavenge_contents_parallel(_old_gen->start_array(),
                                             _old_gen->object_space(),
                                             _gen_top,
                                             pm,