src/hotspot/share/oops/objArrayOop.hpp

*** 55,31 ***
    // Returns the offset of the first element.
    static int base_offset_in_bytes() {
      return arrayOopDesc::base_offset_in_bytes(T_OBJECT);
    }
  
    // base is the address following the header.
    HeapWord* base() const;
  
    // Accessing
    oop obj_at(int index) const;
  
    void obj_at_put(int index, oop value);
! 
-   oop replace_if_null(int index, oop exchange_value);
- 
-   // Sizing
-   size_t object_size()        { return object_size(length()); }
- 
-   static size_t object_size(int length) {
-     // This returns the object size in HeapWords.
-     size_t asz = (size_t)length * heapOopSize;
-     size_t size_words = heap_word_size(base_offset_in_bytes() + asz);
-     size_t osz = align_object_size(size_words);
-     assert(osz < max_jint, "no overflow");
-     return osz;
-   }
  
    Klass* element_klass();
  
  public:
    // special iterators for index ranges, returns size of object
--- 55,21 ---
    // Returns the offset of the first element.
    static int base_offset_in_bytes() {
      return arrayOopDesc::base_offset_in_bytes(T_OBJECT);
    }
  
+   inline static objArrayOop cast(oop o);
+ 
    // base is the address following the header.
    HeapWord* base() const;
  
    // Accessing
    oop obj_at(int index) const;
+   oop obj_at(int index, TRAPS) const;
  
    void obj_at_put(int index, oop value);
!   void obj_at_put(int index, oop value, TRAPS);
  
    Klass* element_klass();
  
  public:
    // special iterators for index ranges, returns size of object