src/share/vm/ci/ciObject.hpp

rev 8961 : [mq]: diff-shenandoah.patch

*** 25,34 ****
--- 25,35 ----
  #ifndef SHARE_VM_CI_CIOBJECT_HPP
  #define SHARE_VM_CI_CIOBJECT_HPP
  
  #include "ci/ciBaseObject.hpp"
  #include "ci/ciClassList.hpp"
+ #include "gc/shared/barrierSet.hpp"
  #include "memory/allocation.hpp"
  #include "runtime/handles.hpp"
  #include "runtime/jniHandles.hpp"
  
  // ciObject
*** 67,77 ****
  
    jobject      handle()  const { return _handle; }
    // Get the VM oop that this object holds.
    oop get_oop() const {
      assert(_handle != NULL, "null oop");
!     return JNIHandles::resolve_non_null(_handle);
    }
  
    void init_flags_from(oop x);
  
    // Virtual behavior of the print() method.
--- 68,80 ----
  
    jobject      handle()  const { return _handle; }
    // Get the VM oop that this object holds.
    oop get_oop() const {
      assert(_handle != NULL, "null oop");
!     oop obj = JNIHandles::resolve_non_null(_handle);
!     assert(obj == oopDesc::bs()->resolve_and_maybe_copy_oop(obj), "expect to-space copy");
!     return obj;
    }
  
    void init_flags_from(oop x);
  
    // Virtual behavior of the print() method.