src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp

*** 24,39 ****
  
  #include "precompiled.hpp"
  #include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
  #include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
  #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
! #include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
  #include "gc_implementation/parallelScavenge/psScavenge.hpp"
  #include "gc_implementation/parallelScavenge/psTasks.hpp"
  #include "gc_implementation/parallelScavenge/psYoungGen.hpp"
  #include "oops/oop.inline.hpp"
- #include "oops/oop.psgc.inline.hpp"
  #include "runtime/prefetch.inline.hpp"
  
  // Checks an individual oop for missing precise marks. Mark
  // may be either dirty or newgen.
  class CheckForUnmarkedOops : public OopClosure {
--- 24,38 ----
  
  #include "precompiled.hpp"
  #include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
  #include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
  #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
! #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
  #include "gc_implementation/parallelScavenge/psScavenge.hpp"
  #include "gc_implementation/parallelScavenge/psTasks.hpp"
  #include "gc_implementation/parallelScavenge/psYoungGen.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/prefetch.inline.hpp"
  
  // Checks an individual oop for missing precise marks. Mark
  // may be either dirty or newgen.
  class CheckForUnmarkedOops : public OopClosure {
*** 289,307 ****
          if (interval != 0) {
            while (p < to) {
              Prefetch::write(p, interval);
              oop m = oop(p);
              assert(m->is_oop_or_null(), err_msg("Expected an oop or NULL for header field at " PTR_FORMAT, p2i(m)));
!             m->push_contents(pm);
              p += m->size();
            }
            pm->drain_stacks_cond_depth();
          } else {
            while (p < to) {
              oop m = oop(p);
              assert(m->is_oop_or_null(), err_msg("Expected an oop or NULL for header field at " PTR_FORMAT, p2i(m)));
!             m->push_contents(pm);
              p += m->size();
            }
            pm->drain_stacks_cond_depth();
          }
          last_scanned = p;
--- 288,306 ----
          if (interval != 0) {
            while (p < to) {
              Prefetch::write(p, interval);
              oop m = oop(p);
              assert(m->is_oop_or_null(), err_msg("Expected an oop or NULL for header field at " PTR_FORMAT, p2i(m)));
!             pm->push_contents(m);
              p += m->size();
            }
            pm->drain_stacks_cond_depth();
          } else {
            while (p < to) {
              oop m = oop(p);
              assert(m->is_oop_or_null(), err_msg("Expected an oop or NULL for header field at " PTR_FORMAT, p2i(m)));
!             pm->push_contents(m);
              p += m->size();
            }
            pm->drain_stacks_cond_depth();
          }
          last_scanned = p;