test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java

@@ -299,10 +299,11 @@
  import jdk.test.lib.Platform;
  import jdk.test.whitebox.WhiteBox;
  
  public class GetObjectSizeIntrinsicsTest extends ASimpleInstrumentationTestCase {
  
+     private static final boolean COMPACT_HEADERS = Platform.is64bit() && WhiteBox.getWhiteBox().getBooleanVMFlag("UseCompactObjectHeaders");
      static final Boolean COMPRESSED_OOPS = WhiteBox.getWhiteBox().getBooleanVMFlag("UseCompressedOops");
      static final long REF_SIZE = (COMPRESSED_OOPS == null || COMPRESSED_OOPS == true) ? 4 : 8;
  
      static final Long align = WhiteBox.getWhiteBox().getIntVMFlag("ObjectAlignmentInBytes");
      static final int OBJ_ALIGN = (align == null ? 8 : align.intValue());

@@ -311,10 +312,13 @@
  
      // These should overflow 4G size boundary
      static final int LARGE_INT_ARRAY_SIZE = 1024*1024*1024 + 1024;
      static final int LARGE_OBJ_ARRAY_SIZE = (4096/(int)REF_SIZE)*1024*1024 + 1024;
  
+     static final boolean CCP = WhiteBox.getWhiteBox().getBooleanVMFlag("UseCompressedClassPointers");
+     static final int ARRAY_HEADER_SIZE = CCP ? 16 : (Platform.is64bit() ? 20 : 16);
+ 
      final String mode;
  
      public GetObjectSizeIntrinsicsTest(String name, String mode) {
          super(name);
          this.mode = mode;

@@ -369,93 +373,103 @@
  
      private static long roundUp(long v, long a) {
          return (v + a - 1) / a * a;
      }
  
+     private static long expectedSmallObjSize() {
+         long size;
+         if (!Platform.is64bit() || COMPACT_HEADERS) {
+             size = 8;
+         } else {
+             size = 16;
+         }
+         return roundUp(size, OBJ_ALIGN);
+     }
+ 
      private void testSize_newObject() {
-         long expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
+         long expected = expectedSmallObjSize();
          for (int c = 0; c < ITERS; c++) {
              assertEquals(expected, fInst.getObjectSize(new Object()));
          }
      }
  
      private void testSize_localObject() {
-         long expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
+         long expected = expectedSmallObjSize();
          Object o = new Object();
          for (int c = 0; c < ITERS; c++) {
              assertEquals(expected, fInst.getObjectSize(o));
          }
      }
  
      static Object staticO = new Object();
  
      private void testSize_fieldObject() {
-         long expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
+         long expected = expectedSmallObjSize();
          for (int c = 0; c < ITERS; c++) {
              assertEquals(expected, fInst.getObjectSize(staticO));
          }
      }
  
      private void testSize_newSmallIntArray() {
-         long expected = roundUp(4L*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
+         long expected = roundUp(4L*SMALL_ARRAY_SIZE + ARRAY_HEADER_SIZE, OBJ_ALIGN);
          for (int c = 0; c < ITERS; c++) {
              assertEquals(expected, fInst.getObjectSize(new int[SMALL_ARRAY_SIZE]));
          }
      }
  
      private void testSize_localSmallIntArray() {
          int[] arr = new int[SMALL_ARRAY_SIZE];
-         long expected = roundUp(4L*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
+         long expected = roundUp(4L*SMALL_ARRAY_SIZE + ARRAY_HEADER_SIZE, OBJ_ALIGN);
          for (int c = 0; c < ITERS; c++) {
              assertEquals(expected, fInst.getObjectSize(arr));
          }
      }
  
      static int[] smallArr = new int[SMALL_ARRAY_SIZE];
  
      private void testSize_fieldSmallIntArray() {
-         long expected = roundUp(4L*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
+         long expected = roundUp(4L*SMALL_ARRAY_SIZE + ARRAY_HEADER_SIZE, OBJ_ALIGN);
          for (int c = 0; c < ITERS; c++) {
              assertEquals(expected, fInst.getObjectSize(smallArr));
          }
      }
  
      private void testSize_newSmallObjArray() {
-         long expected = roundUp(REF_SIZE*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
+         long expected = roundUp(REF_SIZE*SMALL_ARRAY_SIZE + ARRAY_HEADER_SIZE, OBJ_ALIGN);
          for (int c = 0; c < ITERS; c++) {
              assertEquals(expected, fInst.getObjectSize(new Object[SMALL_ARRAY_SIZE]));
          }
      }
  
      private void testSize_localSmallObjArray() {
          Object[] arr = new Object[SMALL_ARRAY_SIZE];
-         long expected = roundUp(REF_SIZE*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
+         long expected = roundUp(REF_SIZE*SMALL_ARRAY_SIZE + ARRAY_HEADER_SIZE, OBJ_ALIGN);
          for (int c = 0; c < ITERS; c++) {
              assertEquals(expected, fInst.getObjectSize(arr));
          }
      }
  
      static Object[] smallObjArr = new Object[SMALL_ARRAY_SIZE];
  
      private void testSize_fieldSmallObjArray() {
-         long expected = roundUp(REF_SIZE*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
+         long expected = roundUp(REF_SIZE*SMALL_ARRAY_SIZE + ARRAY_HEADER_SIZE, OBJ_ALIGN);
          for (int c = 0; c < ITERS; c++) {
              assertEquals(expected, fInst.getObjectSize(smallObjArr));
          }
      }
  
      private void testSize_localLargeIntArray() {
          int[] arr = new int[LARGE_INT_ARRAY_SIZE];
-         long expected = roundUp(4L*LARGE_INT_ARRAY_SIZE + 16, OBJ_ALIGN);
+         long expected = roundUp(4L*LARGE_INT_ARRAY_SIZE + ARRAY_HEADER_SIZE, OBJ_ALIGN);
          for (int c = 0; c < ITERS; c++) {
              assertEquals(expected, fInst.getObjectSize(arr));
          }
      }
  
      private void testSize_localLargeObjArray() {
          Object[] arr = new Object[LARGE_OBJ_ARRAY_SIZE];
-         long expected = roundUp(REF_SIZE*LARGE_OBJ_ARRAY_SIZE + 16, OBJ_ALIGN);
+         long expected = roundUp(REF_SIZE*LARGE_OBJ_ARRAY_SIZE + ARRAY_HEADER_SIZE, OBJ_ALIGN);
          for (int c = 0; c < ITERS; c++) {
              assertEquals(expected, fInst.getObjectSize(arr));
          }
      }