--- old/src/hotspot/share/oops/cpCache.cpp	2018-03-05 10:57:00.336169984 -0500
+++ new/src/hotspot/share/oops/cpCache.cpp	2018-03-05 10:56:59.992162810 -0500
@@ -139,8 +139,8 @@
   set_field_flags(field_type,
                   ((is_volatile ? 1 : 0) << is_volatile_shift) |
                   ((is_final    ? 1 : 0) << is_final_shift) |
-                  ((is_flatten  ? 1 : 0) << is_flatten_field) |
-                  ((is_flattenable ? 1 : 0) << is_flattenable_field),
+                  ((is_flatten  ? 1 : 0) << is_flattened_field_shift) |
+                  ((is_flattenable ? 1 : 0) << is_flattenable_field_shift),
                   field_index);
   set_bytecode_1(get_code);
   set_bytecode_2(put_code);