src/share/vm/gc/serial/markSweep.inline.hpp

rev 12504 : 8171235: Move archive object code from G1MarkSweep into G1ArchiveAllocator
Reviewed-by:

*** 28,44 ****
  #include "gc/serial/markSweep.hpp"
  #include "memory/universe.hpp"
  #include "oops/markOop.inline.hpp"
  #include "oops/oop.inline.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1MarkSweep.hpp"
  #endif // INCLUDE_ALL_GCS
  
  inline bool MarkSweep::is_archive_object(oop object) {
  #if INCLUDE_ALL_GCS
!   return (G1MarkSweep::archive_check_enabled() &&
!           G1MarkSweep::in_archive_range(object));
  #else
    return false;
  #endif
  }
  
--- 28,43 ----
  #include "gc/serial/markSweep.hpp"
  #include "memory/universe.hpp"
  #include "oops/markOop.inline.hpp"
  #include "oops/oop.inline.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1Allocator.inline.hpp"
  #endif // INCLUDE_ALL_GCS
  
  inline bool MarkSweep::is_archive_object(oop object) {
  #if INCLUDE_ALL_GCS
!   return G1ArchiveAllocator::is_archive_object(object);
  #else
    return false;
  #endif
  }