--- old/src/hotspot/share/classfile/javaClasses.cpp	2020-08-07 00:36:26.000000000 +0300
+++ new/src/hotspot/share/classfile/javaClasses.cpp	2020-08-07 00:36:26.000000000 +0300
@@ -4533,11 +4533,7 @@
 }
 #endif
 
-int java_lang_Integer_IntegerCache::_static_cache_offset;
-int java_lang_Long_LongCache::_static_cache_offset;
-int java_lang_Character_CharacterCache::_static_cache_offset;
-int java_lang_Short_ShortCache::_static_cache_offset;
-int java_lang_Byte_ByteCache::_static_cache_offset;
+int vector_VectorPayload::_payload_offset;
 
 #define VECTORPAYLOAD_FIELDS_DO(macro) \
   macro(_payload_offset, k, "payload", object_signature, false)
@@ -4561,6 +4557,12 @@
   return obj != NULL && is_subclass(obj->klass());
 }
 
+int java_lang_Integer_IntegerCache::_static_cache_offset;
+int java_lang_Long_LongCache::_static_cache_offset;
+int java_lang_Character_CharacterCache::_static_cache_offset;
+int java_lang_Short_ShortCache::_static_cache_offset;
+int java_lang_Byte_ByteCache::_static_cache_offset;
+
 #define INTEGER_CACHE_FIELDS_DO(macro) \
   macro(_static_cache_offset, k, "cache", java_lang_Integer_array_signature, true)
 
@@ -4760,7 +4762,6 @@
 int java_lang_reflect_RecordComponent::_signature_offset;
 int java_lang_reflect_RecordComponent::_annotations_offset;
 int java_lang_reflect_RecordComponent::_typeAnnotations_offset;
-int vector_VectorPayload::_payload_offset;
 
 #define RECORDCOMPONENT_FIELDS_DO(macro) \
   macro(_clazz_offset,       k, "clazz",       class_signature,  false); \