test/hotspot/gtest/oops/test_objArrayOop.cpp

*** 20,13 ***
--- 20,16 ---
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  #include "oops/objArrayOop.hpp"
+ #include "oops/refArrayOop.hpp"
  #include "unittest.hpp"
  #include "utilities/globalDefinitions.hpp"
  
+ // TODO FIXME This test needs to be rewritten after objArray/refArray/flatArray rework
+ 
  TEST_VM(objArrayOop, osize) {
    static const struct {
      int objal; bool ccp; bool coops; bool coh; int result;
    } x[] = {
  //    ObjAligInB, UseCCP, UseCoops, UseCOH, object size in heap words

*** 55,9 ***
      { -1,         false,  false, false,  -1 }
    };
    for (int i = 0; x[i].result != -1; i++) {
      if (x[i].objal == (int)ObjectAlignmentInBytes && x[i].ccp == UseCompressedClassPointers && x[i].coops == UseCompressedOops &&
          x[i].coh == UseCompactObjectHeaders) {
!       EXPECT_EQ(objArrayOopDesc::object_size(1), (size_t)x[i].result);
      }
    }
  }
--- 58,9 ---
      { -1,         false,  false, false,  -1 }
    };
    for (int i = 0; x[i].result != -1; i++) {
      if (x[i].objal == (int)ObjectAlignmentInBytes && x[i].ccp == UseCompressedClassPointers && x[i].coops == UseCompressedOops &&
          x[i].coh == UseCompactObjectHeaders) {
!       EXPECT_EQ(refArrayOopDesc::object_size(1), (size_t)x[i].result);
      }
    }
  }