src/hotspot/share/oops/oop.inline.hpp

*** 24,34 ****
  
  #ifndef SHARE_VM_OOPS_OOP_INLINE_HPP
  #define SHARE_VM_OOPS_OOP_INLINE_HPP
  
  #include "gc/shared/collectedHeap.hpp"
- #include "memory/metaspaceShared.hpp"
  #include "oops/access.inline.hpp"
  #include "oops/arrayKlass.hpp"
  #include "oops/arrayOop.hpp"
  #include "oops/compressedOops.inline.hpp"
  #include "oops/klass.inline.hpp"
--- 24,33 ----
*** 350,361 ****
  void oopDesc::forward_to(oop p) {
    assert(check_obj_alignment(p),
           "forwarding to something not aligned");
    assert(Universe::heap()->is_in_reserved(p),
           "forwarding to something not in heap");
!   assert(!MetaspaceShared::is_archive_object(oop(this)) &&
!          !MetaspaceShared::is_archive_object(p),
           "forwarding archive object");
    markOop m = markOopDesc::encode_pointer_as_mark(p);
    assert(m->decode_pointer() == p, "encoding must be reversable");
    set_mark_raw(m);
  }
--- 349,360 ----
  void oopDesc::forward_to(oop p) {
    assert(check_obj_alignment(p),
           "forwarding to something not aligned");
    assert(Universe::heap()->is_in_reserved(p),
           "forwarding to something not in heap");
!   assert(!is_archive_object(oop(this)) &&
!          !is_archive_object(p),
           "forwarding archive object");
    markOop m = markOopDesc::encode_pointer_as_mark(p);
    assert(m->decode_pointer() == p, "encoding must be reversable");
    set_mark_raw(m);
  }