test/hotspot/jtreg/runtime/FieldLayout/TestOopMapSizeMinimal.java

@@ -86,11 +86,11 @@
          } else {
              OOP_SIZE_IN_BYTES = 4;
          }
          if (is_64_bit) {
              if (WB.getBooleanVMFlag("UseCompactObjectHeaders")) {
-                 HEADER_SIZE_IN_BYTES = 8;
+                 HEADER_SIZE_IN_BYTES = 4;
              } else {
                  HEADER_SIZE_IN_BYTES = 12;
              }
          } else {
              HEADER_SIZE_IN_BYTES = 8;

@@ -179,11 +179,11 @@
          // There is one combination that has gaps:
          // -UseCompressedOops + +COH: A gap will be following i1, and i2 will therefore nestle into that gap.
          // Otherwise, the same logic applies.
  
          if (OOP_SIZE_IN_BYTES == 4 ||                               // oop size == int size
-             (OOP_SIZE_IN_BYTES == 8 && HEADER_SIZE_IN_BYTES == 12)
+             (OOP_SIZE_IN_BYTES == 8 && (HEADER_SIZE_IN_BYTES == 12 || HEADER_SIZE_IN_BYTES == 4))
          ) {
              // No gaps
  
              // Expected layout for BASE: int, object
              i1_loc_expected = HEADER_SIZE_IN_BYTES;