--- old/src/hotspot/share/classfile/fieldLayoutBuilder.hpp	2020-02-21 02:14:27.195899114 -0800
+++ new/src/hotspot/share/classfile/fieldLayoutBuilder.hpp	2020-02-21 02:14:26.826773923 -0800
@@ -256,6 +256,8 @@
   bool _is_contended;
   bool _is_value_type;
   bool _has_flattening_information;
+  bool _has_nonatomic_values;
+  int _atomic_field_count;
 
   FieldGroup* get_or_create_contended_group(int g);