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

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

*** 278,382 ****
  }
  
  // In order to put or get a field out of an instance, must first check
  // if the field has been compressed and uncompress it.
  inline oop oopDesc::obj_field(int offset) const {
    return UseCompressedOops ?
!     load_decode_heap_oop(obj_field_addr<narrowOop>(offset)) :
!     load_decode_heap_oop(obj_field_addr<oop>(offset));
  }
  
  inline void oopDesc::obj_field_put(int offset, oop value) {
!   UseCompressedOops ? oop_store(obj_field_addr<narrowOop>(offset), value) :
!                       oop_store(obj_field_addr<oop>(offset),       value);
  }
  
  inline Metadata* oopDesc::metadata_field(int offset) const {
!   return *metadata_field_addr(offset);
  }
  
  inline void oopDesc::metadata_field_put(int offset, Metadata* value) {
!   *metadata_field_addr(offset) = value;
  }
  
  inline void oopDesc::obj_field_put_raw(int offset, oop value) {
    UseCompressedOops ?
!     encode_store_heap_oop(obj_field_addr<narrowOop>(offset), value) :
!     encode_store_heap_oop(obj_field_addr<oop>(offset),       value);
  }
  inline void oopDesc::obj_field_put_volatile(int offset, oop value) {
    OrderAccess::release();
    obj_field_put(offset, value);
    OrderAccess::fence();
  }
  
! inline jbyte oopDesc::byte_field(int offset) const                  { return (jbyte) *byte_field_addr(offset);    }
! inline void oopDesc::byte_field_put(int offset, jbyte contents)     { *byte_field_addr(offset) = (jint) contents; }
  
! inline jboolean oopDesc::bool_field(int offset) const               { return (jboolean) *bool_field_addr(offset); }
! inline void oopDesc::bool_field_put(int offset, jboolean contents)  { *bool_field_addr(offset) = (jint) contents; }
  
! inline jchar oopDesc::char_field(int offset) const                  { return (jchar) *char_field_addr(offset);    }
! inline void oopDesc::char_field_put(int offset, jchar contents)     { *char_field_addr(offset) = (jint) contents; }
  
! inline jint oopDesc::int_field(int offset) const                    { return *int_field_addr(offset);        }
! inline void oopDesc::int_field_put(int offset, jint contents)       { *int_field_addr(offset) = contents;    }
  
! inline jshort oopDesc::short_field(int offset) const                { return (jshort) *short_field_addr(offset);  }
! inline void oopDesc::short_field_put(int offset, jshort contents)   { *short_field_addr(offset) = (jint) contents;}
  
! inline jlong oopDesc::long_field(int offset) const                  { return *long_field_addr(offset);       }
! inline void oopDesc::long_field_put(int offset, jlong contents)     { *long_field_addr(offset) = contents;   }
  
! inline jfloat oopDesc::float_field(int offset) const                { return *float_field_addr(offset);      }
! inline void oopDesc::float_field_put(int offset, jfloat contents)   { *float_field_addr(offset) = contents;  }
  
! inline jdouble oopDesc::double_field(int offset) const              { return *double_field_addr(offset);     }
! inline void oopDesc::double_field_put(int offset, jdouble contents) { *double_field_addr(offset) = contents; }
  
! inline address oopDesc::address_field(int offset) const              { return *address_field_addr(offset);     }
! inline void oopDesc::address_field_put(int offset, address contents) { *address_field_addr(offset) = contents; }
  
  inline oop oopDesc::obj_field_acquire(int offset) const {
    return UseCompressedOops ?
               decode_heap_oop((narrowOop)
!                OrderAccess::load_acquire(obj_field_addr<narrowOop>(offset)))
             : decode_heap_oop((oop)
!                OrderAccess::load_ptr_acquire(obj_field_addr<oop>(offset)));
  }
  inline void oopDesc::release_obj_field_put(int offset, oop value) {
    UseCompressedOops ?
!     oop_store((volatile narrowOop*)obj_field_addr<narrowOop>(offset), value) :
!     oop_store((volatile oop*)      obj_field_addr<oop>(offset),       value);
  }
  
! inline jbyte oopDesc::byte_field_acquire(int offset) const                  { return OrderAccess::load_acquire(byte_field_addr(offset));     }
! inline void oopDesc::release_byte_field_put(int offset, jbyte contents)     { OrderAccess::release_store(byte_field_addr(offset), contents); }
  
! inline jboolean oopDesc::bool_field_acquire(int offset) const               { return OrderAccess::load_acquire(bool_field_addr(offset));     }
! inline void oopDesc::release_bool_field_put(int offset, jboolean contents)  { OrderAccess::release_store(bool_field_addr(offset), contents); }
  
! inline jchar oopDesc::char_field_acquire(int offset) const                  { return OrderAccess::load_acquire(char_field_addr(offset));     }
! inline void oopDesc::release_char_field_put(int offset, jchar contents)     { OrderAccess::release_store(char_field_addr(offset), contents); }
  
! inline jint oopDesc::int_field_acquire(int offset) const                    { return OrderAccess::load_acquire(int_field_addr(offset));      }
! inline void oopDesc::release_int_field_put(int offset, jint contents)       { OrderAccess::release_store(int_field_addr(offset), contents);  }
  
! inline jshort oopDesc::short_field_acquire(int offset) const                { return (jshort)OrderAccess::load_acquire(short_field_addr(offset)); }
! inline void oopDesc::release_short_field_put(int offset, jshort contents)   { OrderAccess::release_store(short_field_addr(offset), contents);     }
  
! inline jlong oopDesc::long_field_acquire(int offset) const                  { return OrderAccess::load_acquire(long_field_addr(offset));       }
! inline void oopDesc::release_long_field_put(int offset, jlong contents)     { OrderAccess::release_store(long_field_addr(offset), contents);   }
  
! inline jfloat oopDesc::float_field_acquire(int offset) const                { return OrderAccess::load_acquire(float_field_addr(offset));      }
! inline void oopDesc::release_float_field_put(int offset, jfloat contents)   { OrderAccess::release_store(float_field_addr(offset), contents);  }
  
! inline jdouble oopDesc::double_field_acquire(int offset) const              { return OrderAccess::load_acquire(double_field_addr(offset));     }
! inline void oopDesc::release_double_field_put(int offset, jdouble contents) { OrderAccess::release_store(double_field_addr(offset), contents); }
  
! inline address oopDesc::address_field_acquire(int offset) const             { return (address) OrderAccess::load_ptr_acquire(address_field_addr(offset)); }
! inline void oopDesc::release_address_field_put(int offset, address contents) { OrderAccess::release_store_ptr(address_field_addr(offset), contents); }
  
  inline int oopDesc::size_given_klass(Klass* klass)  {
    int lh = klass->layout_helper();
    int s;
  
--- 278,500 ----
  }
  
  // In order to put or get a field out of an instance, must first check
  // if the field has been compressed and uncompress it.
  inline oop oopDesc::obj_field(int offset) const {
+   oop p = bs()->resolve_oop((oop) this);
    return UseCompressedOops ?
!     load_decode_heap_oop(p->obj_field_addr<narrowOop>(offset)) :
!     load_decode_heap_oop(p->obj_field_addr<oop>(offset));
  }
  
  inline void oopDesc::obj_field_put(int offset, oop value) {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   value = bs()->resolve_oop(value);
!   UseCompressedOops ? oop_store(p->obj_field_addr<narrowOop>(offset), value) :
!                       oop_store(p->obj_field_addr<oop>(offset),       value);
  }
  
  inline Metadata* oopDesc::metadata_field(int offset) const {
!   oop p = bs()->resolve_oop((oop) this);
!   return *p->metadata_field_addr(offset);
  }
  
  inline void oopDesc::metadata_field_put(int offset, Metadata* value) {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   *p->metadata_field_addr(offset) = value;
  }
  
  inline void oopDesc::obj_field_put_raw(int offset, oop value) {
+   oop p = bs()->resolve_and_maybe_copy_oop(this);
+   value = bs()->resolve_oop(value);
    UseCompressedOops ?
!     encode_store_heap_oop(p->obj_field_addr<narrowOop>(offset), value) :
!     encode_store_heap_oop(p->obj_field_addr<oop>(offset),       value);
  }
  inline void oopDesc::obj_field_put_volatile(int offset, oop value) {
    OrderAccess::release();
    obj_field_put(offset, value);
    OrderAccess::fence();
  }
  
! inline jbyte oopDesc::byte_field(int offset) const                  {
!   oop p = bs()->resolve_oop((oop) this);
!   return (jbyte) *p->byte_field_addr(offset);
! }
! inline void oopDesc::byte_field_put(int offset, jbyte contents)     {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   *p->byte_field_addr(offset) = (jint) contents;
! }
  
! inline jboolean oopDesc::bool_field(int offset) const               {
!   oop p = bs()->resolve_oop((oop) this);
!   return (jboolean) *p->bool_field_addr(offset);
! }
! inline void oopDesc::bool_field_put(int offset, jboolean contents)  {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   *p->bool_field_addr(offset) = (jint) contents;
! }
  
! inline jchar oopDesc::char_field(int offset) const                  {
!   oop p = bs()->resolve_oop((oop) this);
!   return (jchar) *p->char_field_addr(offset);
! }
! inline void oopDesc::char_field_put(int offset, jchar contents)     {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   *p->char_field_addr(offset) = (jint) contents;
! }
  
! inline jint oopDesc::int_field(int offset) const                    {
!   oop p = bs()->resolve_oop((oop) this);
!   return *p->int_field_addr(offset);
! }
! inline void oopDesc::int_field_put(int offset, jint contents)       {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   *p->int_field_addr(offset) = contents;
! }
  
! inline jshort oopDesc::short_field(int offset) const                {
!   oop p = bs()->resolve_oop((oop) this);
!   return (jshort) *p->short_field_addr(offset);
! }
! inline void oopDesc::short_field_put(int offset, jshort contents)   {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   *p->short_field_addr(offset) = (jint) contents;
! }
  
! inline jlong oopDesc::long_field(int offset) const                  {
!   oop p = bs()->resolve_oop((oop) this);
!   return *p->long_field_addr(offset);
! }
! inline void oopDesc::long_field_put(int offset, jlong contents)     {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   *p->long_field_addr(offset) = contents;
! }
  
! inline jfloat oopDesc::float_field(int offset) const                {
!   oop p = bs()->resolve_oop((oop) this);
!   return *p->float_field_addr(offset);
! }
! inline void oopDesc::float_field_put(int offset, jfloat contents)   {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   *p->float_field_addr(offset) = contents;
! }
  
! inline jdouble oopDesc::double_field(int offset) const              {
!   oop p = bs()->resolve_oop((oop) this);
!   return *p->double_field_addr(offset);
! }
! inline void oopDesc::double_field_put(int offset, jdouble contents) {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   *p->double_field_addr(offset) = contents;
! }
  
! inline address oopDesc::address_field(int offset) const              {
!   oop p = bs()->resolve_oop((oop) this);
!   return *p->address_field_addr(offset);
! }
! inline void oopDesc::address_field_put(int offset, address contents) {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   *p->address_field_addr(offset) = contents;
! }
  
  inline oop oopDesc::obj_field_acquire(int offset) const {
+   oop p = bs()->resolve_oop((oop) this);
    return UseCompressedOops ?
               decode_heap_oop((narrowOop)
!                OrderAccess::load_acquire(p->obj_field_addr<narrowOop>(offset)))
             : decode_heap_oop((oop)
!                OrderAccess::load_ptr_acquire(p->obj_field_addr<oop>(offset)));
  }
  inline void oopDesc::release_obj_field_put(int offset, oop value) {
+   oop p = bs()->resolve_and_maybe_copy_oop(this);
+   value = bs()->resolve_oop(value);
    UseCompressedOops ?
!     oop_store((volatile narrowOop*)p->obj_field_addr<narrowOop>(offset), value) :
!     oop_store((volatile oop*)      p->obj_field_addr<oop>(offset),       value);
  }
  
! inline jbyte oopDesc::byte_field_acquire(int offset) const                  {
!   oop p = bs()->resolve_oop((oop) this);
!   return OrderAccess::load_acquire(p->byte_field_addr(offset));
! }
! inline void oopDesc::release_byte_field_put(int offset, jbyte contents)     {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   OrderAccess::release_store(p->byte_field_addr(offset), contents);
! }
  
! inline jboolean oopDesc::bool_field_acquire(int offset) const               {
!   oop p = bs()->resolve_oop((oop) this);
!   return OrderAccess::load_acquire(p->bool_field_addr(offset));
! }
! inline void oopDesc::release_bool_field_put(int offset, jboolean contents)  {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   OrderAccess::release_store(p->bool_field_addr(offset), contents);
! }
  
! inline jchar oopDesc::char_field_acquire(int offset) const                  {
!   oop p = bs()->resolve_oop((oop) this);
!   return OrderAccess::load_acquire(p->char_field_addr(offset));
! }
! inline void oopDesc::release_char_field_put(int offset, jchar contents)     {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   OrderAccess::release_store(p->char_field_addr(offset), contents);
! }
  
! inline jint oopDesc::int_field_acquire(int offset) const                    {
!   oop p = bs()->resolve_oop((oop) this);
!   return OrderAccess::load_acquire(p->int_field_addr(offset));
! }
! inline void oopDesc::release_int_field_put(int offset, jint contents)       {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   OrderAccess::release_store(p->int_field_addr(offset), contents);
! }
  
! inline jshort oopDesc::short_field_acquire(int offset) const                {
!   oop p = bs()->resolve_oop((oop) this);
!   return (jshort)OrderAccess::load_acquire(p->short_field_addr(offset));
! }
! inline void oopDesc::release_short_field_put(int offset, jshort contents)   {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   OrderAccess::release_store(p->short_field_addr(offset), contents);
! }
  
! inline jlong oopDesc::long_field_acquire(int offset) const                  {
!   oop p = bs()->resolve_oop((oop) this);
!   return OrderAccess::load_acquire(p->long_field_addr(offset));
! }
! inline void oopDesc::release_long_field_put(int offset, jlong contents)     {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   OrderAccess::release_store(p->long_field_addr(offset), contents);
! }
  
! inline jfloat oopDesc::float_field_acquire(int offset) const                {
!   oop p = bs()->resolve_oop((oop) this);
!   return OrderAccess::load_acquire(p->float_field_addr(offset));
! }
! inline void oopDesc::release_float_field_put(int offset, jfloat contents)   {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   OrderAccess::release_store(p->float_field_addr(offset), contents);
! }
  
! inline jdouble oopDesc::double_field_acquire(int offset) const              {
!   oop p = bs()->resolve_oop((oop) this);
!   return OrderAccess::load_acquire(p->double_field_addr(offset));
! }
! inline void oopDesc::release_double_field_put(int offset, jdouble contents) {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   OrderAccess::release_store(p->double_field_addr(offset), contents);
! }
  
! inline address oopDesc::address_field_acquire(int offset) const             {
!   oop p = bs()->resolve_oop((oop) this);
!   return (address) OrderAccess::load_ptr_acquire(p->address_field_addr(offset));
! }
! inline void oopDesc::release_address_field_put(int offset, address contents) {
!   oop p = bs()->resolve_and_maybe_copy_oop(this);
!   OrderAccess::release_store_ptr(p->address_field_addr(offset), contents);
! }
  
  inline int oopDesc::size_given_klass(Klass* klass)  {
    int lh = klass->layout_helper();
    int s;