--- old/src/hotspot/share/oops/instanceOop.hpp	2020-07-09 10:42:04.000000000 -0400
+++ new/src/hotspot/share/oops/instanceOop.hpp	2020-07-09 10:42:04.000000000 -0400
@@ -37,17 +37,10 @@
 
   // If compressed, the offset of the fields of the instance may not be aligned.
   static int base_offset_in_bytes() {
-    if (UseNewFieldLayout) {
-      return (UseCompressedClassPointers) ?
-              klass_gap_offset_in_bytes() :
-              sizeof(instanceOopDesc);
-    } else {
-      // The old layout could not deal with compressed oops being off and compressed
-      // class pointers being off.
-      return (UseCompressedOops && UseCompressedClassPointers) ?
-              klass_gap_offset_in_bytes() :
-              sizeof(instanceOopDesc);
-    }
+    return (UseCompressedClassPointers) ?
+            klass_gap_offset_in_bytes() :
+            sizeof(instanceOopDesc);
+
   }
 };