src/hotspot/share/gc/shared/space.inline.hpp

*** 23,42 ****
   */
  
  #ifndef SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
  #define SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
  
- #include "gc/serial/markSweep.inline.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "gc/shared/generation.hpp"
  #include "gc/shared/space.hpp"
  #include "gc/shared/spaceDecorator.hpp"
  #include "memory/universe.hpp"
  #include "oops/oopsHierarchy.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/prefetch.inline.hpp"
  #include "runtime/safepoint.hpp"
  
  inline HeapWord* Space::block_start(const void* p) {
    return block_start_const(p);
  }
  
--- 23,44 ----
   */
  
  #ifndef SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
  #define SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
  
  #include "gc/shared/collectedHeap.hpp"
  #include "gc/shared/generation.hpp"
  #include "gc/shared/space.hpp"
  #include "gc/shared/spaceDecorator.hpp"
  #include "memory/universe.hpp"
  #include "oops/oopsHierarchy.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/prefetch.inline.hpp"
  #include "runtime/safepoint.hpp"
+ #if INCLUDE_SERIALGC
+ #include "gc/serial/markSweep.inline.hpp"
+ #endif
  
  inline HeapWord* Space::block_start(const void* p) {
    return block_start_const(p);
  }
  
*** 75,84 ****
--- 77,88 ----
  
  size_t CompactibleSpace::obj_size(const HeapWord* addr) const {
    return oop(addr)->size();
  }
  
+ #if INCLUDE_SERIALGC
+ 
  class DeadSpacer : StackObj {
    size_t _allowed_deadspace_words;
    bool _active;
    CompactibleSpace* _space;
  
*** 345,354 ****
--- 349,360 ----
    }
  
    clear_empty_region(space);
  }
  
+ #endif // INCLUDE_SERIALGC
+ 
  size_t ContiguousSpace::scanned_block_size(const HeapWord* addr) const {
    return oop(addr)->size();
  }
  
  #endif // SHARE_VM_GC_SHARED_SPACE_INLINE_HPP