--- old/src/hotspot/share/oops/instanceOop.hpp	2019-08-07 12:43:48.000000000 -0400
+++ new/src/hotspot/share/oops/instanceOop.hpp	2019-08-07 12:43:48.000000000 -0400
@@ -46,7 +46,7 @@
 
   static bool contains_field_offset(int offset, int nonstatic_field_size, bool is_value) {
     int base_in_bytes = base_offset_in_bytes();
-    if (is_value) {
+    if (is_value && !UseNewLayout) {
       // The first field of value types is aligned on a long boundary
       base_in_bytes = align_up(base_in_bytes, BytesPerLong);
     }