--- old/src/hotspot/share/utilities/accessFlags.hpp	2019-05-15 13:57:32.655680579 -0400
+++ new/src/hotspot/share/utilities/accessFlags.hpp	2019-05-15 13:57:32.263678635 -0400
@@ -85,8 +85,8 @@
   JVM_ACC_FIELD_STABLE                    = 0x00000020, // @Stable field, same as JVM_ACC_SYNCHRONIZED and JVM_ACC_SUPER
   JVM_ACC_FIELD_INITIALIZED_FINAL_UPDATE  = 0x00000200, // (static) final field updated outside (class) initializer, same as JVM_ACC_NATIVE
   JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE     = 0x00000800, // field has generic signature
-  /* JVM_ACC_FLATTENABLE                     = 0x00000100, */ // To be enabled when ACC_FLATTENABLE is removed from java.base
-  JVM_ACC_FIELD_FLATTENED                 = 0x00008000, // flattened value field
+  JVM_ACC_FIELD_FLATTENABLE               = 0x00004000, // flattenable field
+  JVM_ACC_FIELD_FLATTENED                 = 0x00008000, // flattened field
 
   JVM_ACC_FIELD_INTERNAL_FLAGS       = JVM_ACC_FIELD_ACCESS_WATCHED |
                                        JVM_ACC_FIELD_MODIFICATION_WATCHED |
@@ -94,6 +94,7 @@
                                        JVM_ACC_FIELD_STABLE |
                                        JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE |
                                        JVM_ACC_FLATTENABLE |
+                                       JVM_ACC_FIELD_FLATTENABLE |
                                        JVM_ACC_FIELD_FLATTENED,
 
                                                     // flags accepted by set_field_flags()