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

*** 35,45 ****
  #include "gc/g1/heapRegionTracer.hpp"
  #include "gc/shared/genOopClosures.inline.hpp"
  #include "gc/shared/space.inline.hpp"
  #include "logging/log.hpp"
  #include "logging/logStream.hpp"
! #include "memory/iterator.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/access.inline.hpp"
  #include "oops/compressedOops.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/atomic.hpp"
--- 35,45 ----
  #include "gc/g1/heapRegionTracer.hpp"
  #include "gc/shared/genOopClosures.inline.hpp"
  #include "gc/shared/space.inline.hpp"
  #include "logging/log.hpp"
  #include "logging/logStream.hpp"
! #include "memory/iterator.inline.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/access.inline.hpp"
  #include "oops/compressedOops.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/atomic.hpp"
*** 448,458 ****
    }
    st->print_cr("|TAMS " PTR_FORMAT ", " PTR_FORMAT "| %s ",
                 p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()), rem_set()->get_state_str());
  }
  
! class G1VerificationClosure : public ExtendedOopClosure {
  protected:
    G1CollectedHeap* _g1h;
    G1CardTable *_ct;
    oop _containing_obj;
    bool _failures;
--- 448,458 ----
    }
    st->print_cr("|TAMS " PTR_FORMAT ", " PTR_FORMAT "| %s ",
                 p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()), rem_set()->get_state_str());
  }
  
! class G1VerificationClosure : public BasicOopIterateClosure {
  protected:
    G1CollectedHeap* _g1h;
    G1CardTable *_ct;
    oop _containing_obj;
    bool _failures;
*** 606,616 ****
      }
    }
  };
  
  // Closure that applies the given two closures in sequence.
! class G1Mux2Closure : public ExtendedOopClosure {
    OopClosure* _c1;
    OopClosure* _c2;
  public:
    G1Mux2Closure(OopClosure *c1, OopClosure *c2) { _c1 = c1; _c2 = c2; }
    template <class T> inline void do_oop_work(T* p) {
--- 606,616 ----
      }
    }
  };
  
  // Closure that applies the given two closures in sequence.
! class G1Mux2Closure : public BasicOopIterateClosure {
    OopClosure* _c1;
    OopClosure* _c2;
  public:
    G1Mux2Closure(OopClosure *c1, OopClosure *c2) { _c1 = c1; _c2 = c2; }
    template <class T> inline void do_oop_work(T* p) {