From eb840eceeeb2c0ce27ef0a2e2990b8034feb2afa Mon Sep 17 00:00:00 2001 From: syfFerdinand <75394579+syfFerdinand@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:03:11 +0000 Subject: [PATCH 1/6] Moved inlinearray_value to infrequent_data structure in MonoClass --- src/mono/mono/component/debugger-agent.c | 4 ++-- src/mono/mono/metadata/class-getters.h | 2 +- src/mono/mono/metadata/class-init.c | 8 ++++---- src/mono/mono/metadata/class-private-definition.h | 2 +- src/mono/mono/metadata/marshal.c | 4 ++-- src/mono/mono/metadata/object.c | 2 +- src/mono/mono/metadata/property-bag.h | 2 ++ 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/mono/mono/component/debugger-agent.c b/src/mono/mono/component/debugger-agent.c index 1de2a9e18b6875..45864c07452082 100644 --- a/src/mono/mono/component/debugger-agent.c +++ b/src/mono/mono/component/debugger-agent.c @@ -5254,7 +5254,7 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain, } if (CHECK_PROTOCOL_VERSION(2, 65)) { if (m_class_is_inlinearray (klass) && nfields == 1) - buffer_add_int (buf, m_class_inlinearray_value (klass)); + buffer_add_int (buf, m_class_inlinearray_value (m_class_get_infrequent_data (klass))); else buffer_add_int (buf, -1); } @@ -5292,7 +5292,7 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain, if (CHECK_PROTOCOL_VERSION(2, 65)) { if (m_class_is_inlinearray (klass) && nfields == 1) { int element_size = mono_class_instance_size (mono_class_from_mono_type_internal (f->type)) - MONO_ABI_SIZEOF (MonoObject); - int array_size = m_class_inlinearray_value (klass); + int array_size = m_class_inlinearray_value (m_class_get_infrequent_data (klass)); for (int i = 1; i < array_size; i++) buffer_add_value_full (buf, f->type, ((char*)mono_vtype_get_field_addr (addr, f)) + (i*element_size), domain, FALSE, parent_vtypes, len_fixed_array != 1 ? len_fixed_array : isFixedSizeArray(f)); } diff --git a/src/mono/mono/metadata/class-getters.h b/src/mono/mono/metadata/class-getters.h index 30cc66fcf7c176..349d4c58a64233 100644 --- a/src/mono/mono/metadata/class-getters.h +++ b/src/mono/mono/metadata/class-getters.h @@ -30,7 +30,7 @@ MONO_CLASS_GETTER(m_class_was_typebuilder, gboolean, , MonoClass, wastypebuilder MONO_CLASS_GETTER(m_class_is_array_special_interface, gboolean, , MonoClass, is_array_special_interface) MONO_CLASS_GETTER(m_class_is_byreflike, gboolean, , MonoClass, is_byreflike) MONO_CLASS_GETTER(m_class_is_inlinearray, gboolean, , MonoClass, is_inlinearray) -MONO_CLASS_GETTER(m_class_inlinearray_value, gint32, , MonoClass, inlinearray_value) +MONO_CLASS_GETTER(m_class_inlinearray_value, gint32, , MonoPropertyBag, inlinearray_value) MONO_CLASS_GETTER(m_class_get_min_align, guint8, , MonoClass, min_align) MONO_CLASS_GETTER(m_class_get_packing_size, guint, , MonoClass, packing_size) MONO_CLASS_GETTER(m_class_is_ghcimpl, gboolean, , MonoClass, ghcimpl) diff --git a/src/mono/mono/metadata/class-init.c b/src/mono/mono/metadata/class-init.c index 91f40403346167..882e3866e8f61f 100644 --- a/src/mono/mono/metadata/class-init.c +++ b/src/mono/mono/metadata/class-init.c @@ -301,7 +301,7 @@ mono_class_setup_fields (MonoClass *klass) instance_size = MONO_ABI_SIZEOF (MonoObject); } - if (m_class_is_inlinearray (klass) && m_class_inlinearray_value (klass) <= 0) { + if (m_class_is_inlinearray (klass) && m_class_inlinearray_value (&klass->infrequent_data) <= 0) { if (mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback) mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback (klass, "Inline array length property must be positive."); else @@ -735,7 +735,7 @@ mono_class_create_from_typedef (MonoImage *image, guint32 type_token, MonoError attr = class_has_inlinearray_attribute (klass); if (attr.has_attr) { klass->is_inlinearray = 1; - klass->inlinearray_value = GPOINTER_TO_INT32 (attr.value); + klass->infrequent_data.inlinearray_value = GPOINTER_TO_INT32 (attr.value); } } @@ -940,7 +940,7 @@ mono_class_create_generic_inst (MonoGenericClass *gclass) klass->this_arg.data.generic_class = klass->_byval_arg.data.generic_class = gclass; klass->this_arg.byref__ = TRUE; klass->is_inlinearray = gklass->is_inlinearray; - klass->inlinearray_value = gklass->inlinearray_value; + klass->infrequent_data.inlinearray_value = gklass->infrequent_data.inlinearray_value; klass->is_exception_class = gklass->is_exception_class; klass->enumtype = gklass->enumtype; klass->valuetype = gklass->valuetype; @@ -2295,7 +2295,7 @@ mono_class_layout_fields (MonoClass *klass, int base_instance_size, int packing_ const guint32 struct_max_size = 1024 * 1024; guint32 initial_size = size; // If size overflows, it returns 0 - size *= m_class_inlinearray_value (klass); + size *= m_class_inlinearray_value (&klass->infrequent_data); inlined_fields++; if(size == 0 || size > struct_max_size) { if (mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback) { diff --git a/src/mono/mono/metadata/class-private-definition.h b/src/mono/mono/metadata/class-private-definition.h index 829ac16d12903e..005cd05935067e 100644 --- a/src/mono/mono/metadata/class-private-definition.h +++ b/src/mono/mono/metadata/class-private-definition.h @@ -101,7 +101,7 @@ struct _MonoClass { guint16 *interface_offsets_packed; guint8 *interface_bitmap; - gint32 inlinearray_value; /* System.Runtime.CompilerServices.InlineArrayAttribute length value */ + guint name_hash; MonoClass **interfaces; diff --git a/src/mono/mono/metadata/marshal.c b/src/mono/mono/metadata/marshal.c index 112c81f2ad19ef..8342a78826e13a 100644 --- a/src/mono/mono/metadata/marshal.c +++ b/src/mono/mono/metadata/marshal.c @@ -5983,7 +5983,7 @@ mono_marshal_load_type_info (MonoClass* klass) // Limit the max size of array instance to 1MiB const int struct_max_size = 1024 * 1024; guint32 initial_size = size; - size *= m_class_inlinearray_value (klass); + size *= m_class_inlinearray_value (m_class_get_infrequent_data (klass)); if(size == 0 || size > struct_max_size) { if (mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback) { if (mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback (klass, "Inline array struct size out of bounds, abnormally large.")) @@ -6815,7 +6815,7 @@ static void record_inlinearray_struct_physical_lowering (guint8* lowered_bytes, g_assert (field); MonoType* fieldType = field->type; - for (int i = 0; i < m_class_inlinearray_value(klass); ++i) { + for (int i = 0; i < m_class_inlinearray_value(m_class_get_infrequent_data (klass)); ++i) { record_struct_field_physical_lowering(lowered_bytes, fieldType, offset + m_field_get_offset(field) + i * mono_type_size(fieldType, &align) - type_offset); } } diff --git a/src/mono/mono/metadata/object.c b/src/mono/mono/metadata/object.c index 1c1a632a4003e7..ab43d17530e447 100644 --- a/src/mono/mono/metadata/object.c +++ b/src/mono/mono/metadata/object.c @@ -908,7 +908,7 @@ compute_class_bitmap (MonoClass *klass, gsize *bitmap, int size, int offset, int guint32 field_instance_offset = field_offset; // If struct has InlineArray attribute, iterate `length` times to set a bitmap if (m_class_is_inlinearray (p)) - field_iter = m_class_inlinearray_value (p); + field_iter = m_class_inlinearray_value (m_class_get_infrequent_data (p)); if (field_iter > 500) g_warning ("Large number of iterations detected when creating a GC bitmap, might affect performance."); diff --git a/src/mono/mono/metadata/property-bag.h b/src/mono/mono/metadata/property-bag.h index b6eef75d382313..d8302bc92ba1ef 100644 --- a/src/mono/mono/metadata/property-bag.h +++ b/src/mono/mono/metadata/property-bag.h @@ -11,6 +11,7 @@ #define __MONO_METADATA_PROPERTY_BAG_H__ #include +#include typedef struct _MonoPropertyBagItem MonoPropertyBagItem; @@ -21,6 +22,7 @@ struct _MonoPropertyBagItem { typedef struct { MonoPropertyBagItem *head; + gint32 inlinearray_value; } MonoPropertyBag; void* mono_property_bag_get (MonoPropertyBag *bag, int tag); From 375610c8730f393f82a58e201e8b42c7de7853db Mon Sep 17 00:00:00 2001 From: syfFerdinand <75394579+syfFerdinand@users.noreply.github.com> Date: Fri, 8 Nov 2024 03:00:08 +0000 Subject: [PATCH 2/6] Move MonoClass:inlinearray_value out of MonoClass, setting explicit value for PROP_INLINEARRAY_VALUE --- src/mono/mono/component/debugger-agent.c | 4 ++-- src/mono/mono/metadata/class-accessors.c | 16 ++++++++++++++++ src/mono/mono/metadata/class-getters.h | 1 - src/mono/mono/metadata/class-init.c | 8 ++++---- src/mono/mono/metadata/class-internals.h | 6 ++++++ src/mono/mono/metadata/marshal.c | 4 ++-- src/mono/mono/metadata/object.c | 2 +- src/mono/mono/metadata/property-bag.h | 2 -- 8 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/mono/mono/component/debugger-agent.c b/src/mono/mono/component/debugger-agent.c index 45864c07452082..3552d67930ac90 100644 --- a/src/mono/mono/component/debugger-agent.c +++ b/src/mono/mono/component/debugger-agent.c @@ -5254,7 +5254,7 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain, } if (CHECK_PROTOCOL_VERSION(2, 65)) { if (m_class_is_inlinearray (klass) && nfields == 1) - buffer_add_int (buf, m_class_inlinearray_value (m_class_get_infrequent_data (klass))); + buffer_add_int (buf, mono_class_get_inlinearray_value (klass) ); else buffer_add_int (buf, -1); } @@ -5292,7 +5292,7 @@ buffer_add_value_full (Buffer *buf, MonoType *t, void *addr, MonoDomain *domain, if (CHECK_PROTOCOL_VERSION(2, 65)) { if (m_class_is_inlinearray (klass) && nfields == 1) { int element_size = mono_class_instance_size (mono_class_from_mono_type_internal (f->type)) - MONO_ABI_SIZEOF (MonoObject); - int array_size = m_class_inlinearray_value (m_class_get_infrequent_data (klass)); + int array_size = mono_class_get_inlinearray_value (klass); for (int i = 1; i < array_size; i++) buffer_add_value_full (buf, f->type, ((char*)mono_vtype_get_field_addr (addr, f)) + (i*element_size), domain, FALSE, parent_vtypes, len_fixed_array != 1 ? len_fixed_array : isFixedSizeArray(f)); } diff --git a/src/mono/mono/metadata/class-accessors.c b/src/mono/mono/metadata/class-accessors.c index b18b16b985df49..c71a5073fafe7f 100644 --- a/src/mono/mono/metadata/class-accessors.c +++ b/src/mono/mono/metadata/class-accessors.c @@ -30,6 +30,7 @@ typedef enum { PROP_FIELD_DEF_VALUES_4BYTESWIZZLE = 12, /* MonoFieldDefaultValue* with default values swizzled at 4 byte boundaries*/ PROP_FIELD_DEF_VALUES_8BYTESWIZZLE = 13, /* MonoFieldDefaultValue* with default values swizzled at 8 byte boundaries*/ PROP_METADATA_UPDATE_INFO = 14, /* MonoClassMetadataUpdateInfo* */ + PROP_INLINEARRAY_VALUE = 15, /* System.Runtime.CompilerServices.InlineArrayAttribute length value */ } InfrequentDataKind; /* Accessors based on class kind*/ @@ -684,6 +685,21 @@ mono_class_has_metadata_update_info (MonoClass *klass) } } +gint32 +mono_class_get_inlinearray_value (MonoClass *klass) +{ + Uint32Property *prop = (Uint32Property*)mono_property_bag_get (m_class_get_infrequent_data (klass), PROP_INLINEARRAY_VALUE); + return prop ? prop->value : 0; +} + +void +mono_class_set_inlinearray_value (MonoClass *klass, gint32 value) +{ + Uint32Property *prop = (Uint32Property*)mono_class_alloc (klass, sizeof (Uint32Property)); + prop->head.tag = PROP_INLINEARRAY_VALUE; + prop->value = value; + mono_property_bag_add (m_class_get_infrequent_data (klass), prop); +} #ifdef MONO_CLASS_DEF_PRIVATE #define MONO_CLASS_GETTER(funcname, rettype, optref, argtype, fieldname) rettype funcname (argtype *klass) { return optref klass-> fieldname ; } diff --git a/src/mono/mono/metadata/class-getters.h b/src/mono/mono/metadata/class-getters.h index 349d4c58a64233..022a6e3a630db3 100644 --- a/src/mono/mono/metadata/class-getters.h +++ b/src/mono/mono/metadata/class-getters.h @@ -30,7 +30,6 @@ MONO_CLASS_GETTER(m_class_was_typebuilder, gboolean, , MonoClass, wastypebuilder MONO_CLASS_GETTER(m_class_is_array_special_interface, gboolean, , MonoClass, is_array_special_interface) MONO_CLASS_GETTER(m_class_is_byreflike, gboolean, , MonoClass, is_byreflike) MONO_CLASS_GETTER(m_class_is_inlinearray, gboolean, , MonoClass, is_inlinearray) -MONO_CLASS_GETTER(m_class_inlinearray_value, gint32, , MonoPropertyBag, inlinearray_value) MONO_CLASS_GETTER(m_class_get_min_align, guint8, , MonoClass, min_align) MONO_CLASS_GETTER(m_class_get_packing_size, guint, , MonoClass, packing_size) MONO_CLASS_GETTER(m_class_is_ghcimpl, gboolean, , MonoClass, ghcimpl) diff --git a/src/mono/mono/metadata/class-init.c b/src/mono/mono/metadata/class-init.c index 882e3866e8f61f..59920cccd1aedc 100644 --- a/src/mono/mono/metadata/class-init.c +++ b/src/mono/mono/metadata/class-init.c @@ -301,7 +301,7 @@ mono_class_setup_fields (MonoClass *klass) instance_size = MONO_ABI_SIZEOF (MonoObject); } - if (m_class_is_inlinearray (klass) && m_class_inlinearray_value (&klass->infrequent_data) <= 0) { + if (m_class_is_inlinearray (klass) && mono_class_get_inlinearray_value (klass) <= 0) { if (mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback) mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback (klass, "Inline array length property must be positive."); else @@ -735,7 +735,7 @@ mono_class_create_from_typedef (MonoImage *image, guint32 type_token, MonoError attr = class_has_inlinearray_attribute (klass); if (attr.has_attr) { klass->is_inlinearray = 1; - klass->infrequent_data.inlinearray_value = GPOINTER_TO_INT32 (attr.value); + mono_class_set_inlinearray_value(klass, GPOINTER_TO_INT32 (attr.value)); } } @@ -940,7 +940,7 @@ mono_class_create_generic_inst (MonoGenericClass *gclass) klass->this_arg.data.generic_class = klass->_byval_arg.data.generic_class = gclass; klass->this_arg.byref__ = TRUE; klass->is_inlinearray = gklass->is_inlinearray; - klass->infrequent_data.inlinearray_value = gklass->infrequent_data.inlinearray_value; + mono_class_set_inlinearray_value(klass, mono_class_get_inlinearray_value(gklass)); klass->is_exception_class = gklass->is_exception_class; klass->enumtype = gklass->enumtype; klass->valuetype = gklass->valuetype; @@ -2295,7 +2295,7 @@ mono_class_layout_fields (MonoClass *klass, int base_instance_size, int packing_ const guint32 struct_max_size = 1024 * 1024; guint32 initial_size = size; // If size overflows, it returns 0 - size *= m_class_inlinearray_value (&klass->infrequent_data); + size *= mono_class_get_inlinearray_value (klass); inlined_fields++; if(size == 0 || size > struct_max_size) { if (mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback) { diff --git a/src/mono/mono/metadata/class-internals.h b/src/mono/mono/metadata/class-internals.h index e44ba4c7b49026..166f53a5e876f2 100644 --- a/src/mono/mono/metadata/class-internals.h +++ b/src/mono/mono/metadata/class-internals.h @@ -1356,6 +1356,12 @@ mono_class_get_declsec_flags (MonoClass *klass); void mono_class_set_declsec_flags (MonoClass *klass, guint32 value); +gint32 +mono_class_get_inlinearray_value (MonoClass *klass); + +void +mono_class_set_inlinearray_value (MonoClass *klass, gint32 value); + void mono_class_set_weak_bitmap (MonoClass *klass, int nbits, gsize *bits); diff --git a/src/mono/mono/metadata/marshal.c b/src/mono/mono/metadata/marshal.c index 8342a78826e13a..99d914ba32b66e 100644 --- a/src/mono/mono/metadata/marshal.c +++ b/src/mono/mono/metadata/marshal.c @@ -5983,7 +5983,7 @@ mono_marshal_load_type_info (MonoClass* klass) // Limit the max size of array instance to 1MiB const int struct_max_size = 1024 * 1024; guint32 initial_size = size; - size *= m_class_inlinearray_value (m_class_get_infrequent_data (klass)); + size *= mono_class_get_inlinearray_value (klass); if(size == 0 || size > struct_max_size) { if (mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback) { if (mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback (klass, "Inline array struct size out of bounds, abnormally large.")) @@ -6815,7 +6815,7 @@ static void record_inlinearray_struct_physical_lowering (guint8* lowered_bytes, g_assert (field); MonoType* fieldType = field->type; - for (int i = 0; i < m_class_inlinearray_value(m_class_get_infrequent_data (klass)); ++i) { + for (int i = 0; i < mono_class_get_inlinearray_value (klass); ++i) { record_struct_field_physical_lowering(lowered_bytes, fieldType, offset + m_field_get_offset(field) + i * mono_type_size(fieldType, &align) - type_offset); } } diff --git a/src/mono/mono/metadata/object.c b/src/mono/mono/metadata/object.c index ab43d17530e447..167e8828a0878b 100644 --- a/src/mono/mono/metadata/object.c +++ b/src/mono/mono/metadata/object.c @@ -908,7 +908,7 @@ compute_class_bitmap (MonoClass *klass, gsize *bitmap, int size, int offset, int guint32 field_instance_offset = field_offset; // If struct has InlineArray attribute, iterate `length` times to set a bitmap if (m_class_is_inlinearray (p)) - field_iter = m_class_inlinearray_value (m_class_get_infrequent_data (p)); + field_iter = mono_class_get_inlinearray_value (p); if (field_iter > 500) g_warning ("Large number of iterations detected when creating a GC bitmap, might affect performance."); diff --git a/src/mono/mono/metadata/property-bag.h b/src/mono/mono/metadata/property-bag.h index d8302bc92ba1ef..b6eef75d382313 100644 --- a/src/mono/mono/metadata/property-bag.h +++ b/src/mono/mono/metadata/property-bag.h @@ -11,7 +11,6 @@ #define __MONO_METADATA_PROPERTY_BAG_H__ #include -#include typedef struct _MonoPropertyBagItem MonoPropertyBagItem; @@ -22,7 +21,6 @@ struct _MonoPropertyBagItem { typedef struct { MonoPropertyBagItem *head; - gint32 inlinearray_value; } MonoPropertyBag; void* mono_property_bag_get (MonoPropertyBag *bag, int tag); From 73f250d7057d2ef7a338d629abe89684295ed14d Mon Sep 17 00:00:00 2001 From: syfFerdinand <75394579+syfFerdinand@users.noreply.github.com> Date: Sat, 9 Nov 2024 09:38:09 +0000 Subject: [PATCH 3/6] Mark mono_class_get_inlinearray_value with MONO_COMPONENT_API for proper export --- src/mono/mono/metadata/class-internals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/mono/metadata/class-internals.h b/src/mono/mono/metadata/class-internals.h index 166f53a5e876f2..5d804d1634b7bb 100644 --- a/src/mono/mono/metadata/class-internals.h +++ b/src/mono/mono/metadata/class-internals.h @@ -1356,7 +1356,7 @@ mono_class_get_declsec_flags (MonoClass *klass); void mono_class_set_declsec_flags (MonoClass *klass, guint32 value); -gint32 +MONO_COMPONENT_API gint32 mono_class_get_inlinearray_value (MonoClass *klass); void From c94d73dc5b79da47fcc7411f1d772f98002c427d Mon Sep 17 00:00:00 2001 From: syfFerdinand <75394579+syfFerdinand@users.noreply.github.com> Date: Wed, 13 Nov 2024 14:06:39 +0000 Subject: [PATCH 4/6] Remove obsolete offset for inlinearray_value in MonoClass --- src/mono/mono/offsets/armv7-none-linux-androideabi.h | 1 - src/mono/mono/offsets/i686-none-linux-android.h | 1 - src/mono/mono/offsets/wasm32-unknown-none.h | 1 - src/mono/mono/offsets/wasm32-unknown-wasip2.h | 1 - src/mono/mono/offsets/x86_64-apple-darwin10.h | 1 - src/mono/mono/offsets/x86_64-apple-maccatalyst.h | 1 - src/mono/mono/offsets/x86_64-none-linux-android.h | 1 - 7 files changed, 7 deletions(-) diff --git a/src/mono/mono/offsets/armv7-none-linux-androideabi.h b/src/mono/mono/offsets/armv7-none-linux-androideabi.h index a8468a1342409c..0de169e588b01a 100644 --- a/src/mono/mono/offsets/armv7-none-linux-androideabi.h +++ b/src/mono/mono/offsets/armv7-none-linux-androideabi.h @@ -46,7 +46,6 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,68) DECL_OFFSET2(MonoClass,interfaces_packed,72) DECL_OFFSET2(MonoClass,interface_offsets_packed,76) DECL_OFFSET2(MonoClass,interface_bitmap,80) -DECL_OFFSET2(MonoClass,inlinearray_value,84) DECL_OFFSET2(MonoClass,name_hash,88) DECL_OFFSET2(MonoClass,interfaces,92) DECL_OFFSET2(MonoClass,sizes,96) diff --git a/src/mono/mono/offsets/i686-none-linux-android.h b/src/mono/mono/offsets/i686-none-linux-android.h index 59b24d7e86376c..6bb9c798fdf34a 100644 --- a/src/mono/mono/offsets/i686-none-linux-android.h +++ b/src/mono/mono/offsets/i686-none-linux-android.h @@ -46,7 +46,6 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,68) DECL_OFFSET2(MonoClass,interfaces_packed,72) DECL_OFFSET2(MonoClass,interface_offsets_packed,76) DECL_OFFSET2(MonoClass,interface_bitmap,80) -DECL_OFFSET2(MonoClass,inlinearray_value,84) DECL_OFFSET2(MonoClass,name_hash,88) DECL_OFFSET2(MonoClass,interfaces,92) DECL_OFFSET2(MonoClass,sizes,96) diff --git a/src/mono/mono/offsets/wasm32-unknown-none.h b/src/mono/mono/offsets/wasm32-unknown-none.h index c05a5e8cb1575b..aac5561018accf 100644 --- a/src/mono/mono/offsets/wasm32-unknown-none.h +++ b/src/mono/mono/offsets/wasm32-unknown-none.h @@ -45,7 +45,6 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,68) DECL_OFFSET2(MonoClass,interfaces_packed,72) DECL_OFFSET2(MonoClass,interface_offsets_packed,76) DECL_OFFSET2(MonoClass,interface_bitmap,80) -DECL_OFFSET2(MonoClass,inlinearray_value,84) DECL_OFFSET2(MonoClass,name_hash,88) DECL_OFFSET2(MonoClass,interfaces,92) DECL_OFFSET2(MonoClass,sizes,96) diff --git a/src/mono/mono/offsets/wasm32-unknown-wasip2.h b/src/mono/mono/offsets/wasm32-unknown-wasip2.h index f0a4d4de8e99e5..ac37d2c4a0419e 100644 --- a/src/mono/mono/offsets/wasm32-unknown-wasip2.h +++ b/src/mono/mono/offsets/wasm32-unknown-wasip2.h @@ -45,7 +45,6 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,68) DECL_OFFSET2(MonoClass,interfaces_packed,72) DECL_OFFSET2(MonoClass,interface_offsets_packed,76) DECL_OFFSET2(MonoClass,interface_bitmap,80) -DECL_OFFSET2(MonoClass,inlinearray_value,84) DECL_OFFSET2(MonoClass,name_hash,88) DECL_OFFSET2(MonoClass,interfaces,92) DECL_OFFSET2(MonoClass,sizes,96) diff --git a/src/mono/mono/offsets/x86_64-apple-darwin10.h b/src/mono/mono/offsets/x86_64-apple-darwin10.h index 000ebc5440b551..dd382f181ed3bb 100644 --- a/src/mono/mono/offsets/x86_64-apple-darwin10.h +++ b/src/mono/mono/offsets/x86_64-apple-darwin10.h @@ -45,7 +45,6 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,inlinearray_value,128) DECL_OFFSET2(MonoClass,name_hash,132) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) diff --git a/src/mono/mono/offsets/x86_64-apple-maccatalyst.h b/src/mono/mono/offsets/x86_64-apple-maccatalyst.h index 1ea46b7fc601a8..8c48308118eadf 100644 --- a/src/mono/mono/offsets/x86_64-apple-maccatalyst.h +++ b/src/mono/mono/offsets/x86_64-apple-maccatalyst.h @@ -46,7 +46,6 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,inlinearray_value,128) DECL_OFFSET2(MonoClass,name_hash,132) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) diff --git a/src/mono/mono/offsets/x86_64-none-linux-android.h b/src/mono/mono/offsets/x86_64-none-linux-android.h index ee6b4abf92b42b..8e0fe860571f30 100644 --- a/src/mono/mono/offsets/x86_64-none-linux-android.h +++ b/src/mono/mono/offsets/x86_64-none-linux-android.h @@ -46,7 +46,6 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,inlinearray_value,128) DECL_OFFSET2(MonoClass,name_hash,132) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) From 85eb9725b245f899625967bc9d88a11f4f7564fc Mon Sep 17 00:00:00 2001 From: syfFerdinand <75394579+syfFerdinand@users.noreply.github.com> Date: Wed, 13 Nov 2024 14:09:07 +0000 Subject: [PATCH 5/6] fix on Remove obsolete offset for inlinearray_value in MonoClass --- src/mono/mono/offsets/aarch64-apple-darwin10.h | 1 - src/mono/mono/offsets/aarch64-apple-maccatalyst.h | 1 - src/mono/mono/offsets/aarch64-v8a-linux-android.h | 1 - 3 files changed, 3 deletions(-) diff --git a/src/mono/mono/offsets/aarch64-apple-darwin10.h b/src/mono/mono/offsets/aarch64-apple-darwin10.h index 69c2cdc039c6b5..f1419912a994da 100644 --- a/src/mono/mono/offsets/aarch64-apple-darwin10.h +++ b/src/mono/mono/offsets/aarch64-apple-darwin10.h @@ -46,7 +46,6 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,inlinearray_value,128) DECL_OFFSET2(MonoClass,name_hash,132) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) diff --git a/src/mono/mono/offsets/aarch64-apple-maccatalyst.h b/src/mono/mono/offsets/aarch64-apple-maccatalyst.h index 47f18a795c5a6e..ce2f8bac794e30 100644 --- a/src/mono/mono/offsets/aarch64-apple-maccatalyst.h +++ b/src/mono/mono/offsets/aarch64-apple-maccatalyst.h @@ -46,7 +46,6 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,inlinearray_value,128) DECL_OFFSET2(MonoClass,name_hash,132) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) diff --git a/src/mono/mono/offsets/aarch64-v8a-linux-android.h b/src/mono/mono/offsets/aarch64-v8a-linux-android.h index fa096e4883df99..c13ff716566f51 100644 --- a/src/mono/mono/offsets/aarch64-v8a-linux-android.h +++ b/src/mono/mono/offsets/aarch64-v8a-linux-android.h @@ -46,7 +46,6 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,inlinearray_value,128) DECL_OFFSET2(MonoClass,name_hash,132) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) From cec1cbd92e7d7debd15a2ded340cbc5bb3d499f4 Mon Sep 17 00:00:00 2001 From: syfFerdinand <75394579+syfFerdinand@users.noreply.github.com> Date: Wed, 13 Nov 2024 20:31:10 +0000 Subject: [PATCH 6/6] Update Mono offset files with latest versions from build artifacts --- .../mono/offsets/aarch64-apple-darwin10.h | 2 +- .../mono/offsets/aarch64-apple-maccatalyst.h | 2 +- .../mono/offsets/aarch64-v8a-linux-android.h | 2 +- .../offsets/armv7-none-linux-androideabi.h | 26 +++++++++---------- .../mono/offsets/i686-none-linux-android.h | 26 +++++++++---------- src/mono/mono/offsets/wasm32-unknown-none.h | 26 +++++++++---------- src/mono/mono/offsets/wasm32-unknown-wasip2.h | 26 +++++++++---------- src/mono/mono/offsets/x86_64-apple-darwin10.h | 2 +- .../mono/offsets/x86_64-apple-maccatalyst.h | 2 +- .../mono/offsets/x86_64-none-linux-android.h | 2 +- 10 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/mono/mono/offsets/aarch64-apple-darwin10.h b/src/mono/mono/offsets/aarch64-apple-darwin10.h index f1419912a994da..be48c3a4df13c9 100644 --- a/src/mono/mono/offsets/aarch64-apple-darwin10.h +++ b/src/mono/mono/offsets/aarch64-apple-darwin10.h @@ -46,7 +46,7 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,name_hash,132) +DECL_OFFSET2(MonoClass,name_hash,128) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) DECL_OFFSET2(MonoClass,fields,152) diff --git a/src/mono/mono/offsets/aarch64-apple-maccatalyst.h b/src/mono/mono/offsets/aarch64-apple-maccatalyst.h index ce2f8bac794e30..287077fa12f0df 100644 --- a/src/mono/mono/offsets/aarch64-apple-maccatalyst.h +++ b/src/mono/mono/offsets/aarch64-apple-maccatalyst.h @@ -46,7 +46,7 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,name_hash,132) +DECL_OFFSET2(MonoClass,name_hash,128) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) DECL_OFFSET2(MonoClass,fields,152) diff --git a/src/mono/mono/offsets/aarch64-v8a-linux-android.h b/src/mono/mono/offsets/aarch64-v8a-linux-android.h index c13ff716566f51..11f5553434c891 100644 --- a/src/mono/mono/offsets/aarch64-v8a-linux-android.h +++ b/src/mono/mono/offsets/aarch64-v8a-linux-android.h @@ -46,7 +46,7 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,name_hash,132) +DECL_OFFSET2(MonoClass,name_hash,128) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) DECL_OFFSET2(MonoClass,fields,152) diff --git a/src/mono/mono/offsets/armv7-none-linux-androideabi.h b/src/mono/mono/offsets/armv7-none-linux-androideabi.h index 0de169e588b01a..54b7496e94885e 100644 --- a/src/mono/mono/offsets/armv7-none-linux-androideabi.h +++ b/src/mono/mono/offsets/armv7-none-linux-androideabi.h @@ -23,7 +23,7 @@ DECL_SIZE2(gpointer,4) DECL_SIZE2(MonoObject,8) DECL_OFFSET2(MonoObject,vtable,0) DECL_OFFSET2(MonoObject,synchronisation,4) -DECL_SIZE2(MonoClass,144) +DECL_SIZE2(MonoClass,140) DECL_OFFSET2(MonoClass,element_class,0) DECL_OFFSET2(MonoClass,cast_class,4) DECL_OFFSET2(MonoClass,supertypes,8) @@ -46,18 +46,18 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,68) DECL_OFFSET2(MonoClass,interfaces_packed,72) DECL_OFFSET2(MonoClass,interface_offsets_packed,76) DECL_OFFSET2(MonoClass,interface_bitmap,80) -DECL_OFFSET2(MonoClass,name_hash,88) -DECL_OFFSET2(MonoClass,interfaces,92) -DECL_OFFSET2(MonoClass,sizes,96) -DECL_OFFSET2(MonoClass,fields,100) -DECL_OFFSET2(MonoClass,methods,104) -DECL_OFFSET2(MonoClass,this_arg,108) -DECL_OFFSET2(MonoClass,_byval_arg,116) -DECL_OFFSET2(MonoClass,gc_descr,124) -DECL_OFFSET2(MonoClass,runtime_vtable,128) -DECL_OFFSET2(MonoClass,vtable,132) -DECL_OFFSET2(MonoClass,infrequent_data,136) -DECL_OFFSET2(MonoClass,variant_search_table,140) +DECL_OFFSET2(MonoClass,name_hash,84) +DECL_OFFSET2(MonoClass,interfaces,88) +DECL_OFFSET2(MonoClass,sizes,92) +DECL_OFFSET2(MonoClass,fields,96) +DECL_OFFSET2(MonoClass,methods,100) +DECL_OFFSET2(MonoClass,this_arg,104) +DECL_OFFSET2(MonoClass,_byval_arg,112) +DECL_OFFSET2(MonoClass,gc_descr,120) +DECL_OFFSET2(MonoClass,runtime_vtable,124) +DECL_OFFSET2(MonoClass,vtable,128) +DECL_OFFSET2(MonoClass,infrequent_data,132) +DECL_OFFSET2(MonoClass,variant_search_table,136) DECL_SIZE2(MonoVTable,44) DECL_OFFSET2(MonoVTable,klass,0) DECL_OFFSET2(MonoVTable,gc_descr,4) diff --git a/src/mono/mono/offsets/i686-none-linux-android.h b/src/mono/mono/offsets/i686-none-linux-android.h index 6bb9c798fdf34a..cc36503f7561f3 100644 --- a/src/mono/mono/offsets/i686-none-linux-android.h +++ b/src/mono/mono/offsets/i686-none-linux-android.h @@ -23,7 +23,7 @@ DECL_SIZE2(gpointer,4) DECL_SIZE2(MonoObject,8) DECL_OFFSET2(MonoObject,vtable,0) DECL_OFFSET2(MonoObject,synchronisation,4) -DECL_SIZE2(MonoClass,144) +DECL_SIZE2(MonoClass,140) DECL_OFFSET2(MonoClass,element_class,0) DECL_OFFSET2(MonoClass,cast_class,4) DECL_OFFSET2(MonoClass,supertypes,8) @@ -46,18 +46,18 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,68) DECL_OFFSET2(MonoClass,interfaces_packed,72) DECL_OFFSET2(MonoClass,interface_offsets_packed,76) DECL_OFFSET2(MonoClass,interface_bitmap,80) -DECL_OFFSET2(MonoClass,name_hash,88) -DECL_OFFSET2(MonoClass,interfaces,92) -DECL_OFFSET2(MonoClass,sizes,96) -DECL_OFFSET2(MonoClass,fields,100) -DECL_OFFSET2(MonoClass,methods,104) -DECL_OFFSET2(MonoClass,this_arg,108) -DECL_OFFSET2(MonoClass,_byval_arg,116) -DECL_OFFSET2(MonoClass,gc_descr,124) -DECL_OFFSET2(MonoClass,runtime_vtable,128) -DECL_OFFSET2(MonoClass,vtable,132) -DECL_OFFSET2(MonoClass,infrequent_data,136) -DECL_OFFSET2(MonoClass,variant_search_table,140) +DECL_OFFSET2(MonoClass,name_hash,84) +DECL_OFFSET2(MonoClass,interfaces,88) +DECL_OFFSET2(MonoClass,sizes,92) +DECL_OFFSET2(MonoClass,fields,96) +DECL_OFFSET2(MonoClass,methods,100) +DECL_OFFSET2(MonoClass,this_arg,104) +DECL_OFFSET2(MonoClass,_byval_arg,112) +DECL_OFFSET2(MonoClass,gc_descr,120) +DECL_OFFSET2(MonoClass,runtime_vtable,124) +DECL_OFFSET2(MonoClass,vtable,128) +DECL_OFFSET2(MonoClass,infrequent_data,132) +DECL_OFFSET2(MonoClass,variant_search_table,136) DECL_SIZE2(MonoVTable,44) DECL_OFFSET2(MonoVTable,klass,0) DECL_OFFSET2(MonoVTable,gc_descr,4) diff --git a/src/mono/mono/offsets/wasm32-unknown-none.h b/src/mono/mono/offsets/wasm32-unknown-none.h index aac5561018accf..1f3710d5a3cb58 100644 --- a/src/mono/mono/offsets/wasm32-unknown-none.h +++ b/src/mono/mono/offsets/wasm32-unknown-none.h @@ -22,7 +22,7 @@ DECL_SIZE2(gpointer,4) DECL_SIZE2(MonoObject,8) DECL_OFFSET2(MonoObject,vtable,0) DECL_OFFSET2(MonoObject,synchronisation,4) -DECL_SIZE2(MonoClass,144) +DECL_SIZE2(MonoClass,140) DECL_OFFSET2(MonoClass,element_class,0) DECL_OFFSET2(MonoClass,cast_class,4) DECL_OFFSET2(MonoClass,supertypes,8) @@ -45,18 +45,18 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,68) DECL_OFFSET2(MonoClass,interfaces_packed,72) DECL_OFFSET2(MonoClass,interface_offsets_packed,76) DECL_OFFSET2(MonoClass,interface_bitmap,80) -DECL_OFFSET2(MonoClass,name_hash,88) -DECL_OFFSET2(MonoClass,interfaces,92) -DECL_OFFSET2(MonoClass,sizes,96) -DECL_OFFSET2(MonoClass,fields,100) -DECL_OFFSET2(MonoClass,methods,104) -DECL_OFFSET2(MonoClass,this_arg,108) -DECL_OFFSET2(MonoClass,_byval_arg,116) -DECL_OFFSET2(MonoClass,gc_descr,124) -DECL_OFFSET2(MonoClass,runtime_vtable,128) -DECL_OFFSET2(MonoClass,vtable,132) -DECL_OFFSET2(MonoClass,infrequent_data,136) -DECL_OFFSET2(MonoClass,variant_search_table,140) +DECL_OFFSET2(MonoClass,name_hash,84) +DECL_OFFSET2(MonoClass,interfaces,88) +DECL_OFFSET2(MonoClass,sizes,92) +DECL_OFFSET2(MonoClass,fields,96) +DECL_OFFSET2(MonoClass,methods,100) +DECL_OFFSET2(MonoClass,this_arg,104) +DECL_OFFSET2(MonoClass,_byval_arg,112) +DECL_OFFSET2(MonoClass,gc_descr,120) +DECL_OFFSET2(MonoClass,runtime_vtable,124) +DECL_OFFSET2(MonoClass,vtable,128) +DECL_OFFSET2(MonoClass,infrequent_data,132) +DECL_OFFSET2(MonoClass,variant_search_table,136) DECL_SIZE2(MonoVTable,44) DECL_OFFSET2(MonoVTable,klass,0) DECL_OFFSET2(MonoVTable,gc_descr,4) diff --git a/src/mono/mono/offsets/wasm32-unknown-wasip2.h b/src/mono/mono/offsets/wasm32-unknown-wasip2.h index ac37d2c4a0419e..ba5cba52e72f58 100644 --- a/src/mono/mono/offsets/wasm32-unknown-wasip2.h +++ b/src/mono/mono/offsets/wasm32-unknown-wasip2.h @@ -22,7 +22,7 @@ DECL_SIZE2(gpointer,4) DECL_SIZE2(MonoObject,8) DECL_OFFSET2(MonoObject,vtable,0) DECL_OFFSET2(MonoObject,synchronisation,4) -DECL_SIZE2(MonoClass,144) +DECL_SIZE2(MonoClass,140) DECL_OFFSET2(MonoClass,element_class,0) DECL_OFFSET2(MonoClass,cast_class,4) DECL_OFFSET2(MonoClass,supertypes,8) @@ -45,18 +45,18 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,68) DECL_OFFSET2(MonoClass,interfaces_packed,72) DECL_OFFSET2(MonoClass,interface_offsets_packed,76) DECL_OFFSET2(MonoClass,interface_bitmap,80) -DECL_OFFSET2(MonoClass,name_hash,88) -DECL_OFFSET2(MonoClass,interfaces,92) -DECL_OFFSET2(MonoClass,sizes,96) -DECL_OFFSET2(MonoClass,fields,100) -DECL_OFFSET2(MonoClass,methods,104) -DECL_OFFSET2(MonoClass,this_arg,108) -DECL_OFFSET2(MonoClass,_byval_arg,116) -DECL_OFFSET2(MonoClass,gc_descr,124) -DECL_OFFSET2(MonoClass,runtime_vtable,128) -DECL_OFFSET2(MonoClass,vtable,132) -DECL_OFFSET2(MonoClass,infrequent_data,136) -DECL_OFFSET2(MonoClass,variant_search_table,140) +DECL_OFFSET2(MonoClass,name_hash,84) +DECL_OFFSET2(MonoClass,interfaces,88) +DECL_OFFSET2(MonoClass,sizes,92) +DECL_OFFSET2(MonoClass,fields,96) +DECL_OFFSET2(MonoClass,methods,100) +DECL_OFFSET2(MonoClass,this_arg,104) +DECL_OFFSET2(MonoClass,_byval_arg,112) +DECL_OFFSET2(MonoClass,gc_descr,120) +DECL_OFFSET2(MonoClass,runtime_vtable,124) +DECL_OFFSET2(MonoClass,vtable,128) +DECL_OFFSET2(MonoClass,infrequent_data,132) +DECL_OFFSET2(MonoClass,variant_search_table,136) DECL_SIZE2(MonoVTable,44) DECL_OFFSET2(MonoVTable,klass,0) DECL_OFFSET2(MonoVTable,gc_descr,4) diff --git a/src/mono/mono/offsets/x86_64-apple-darwin10.h b/src/mono/mono/offsets/x86_64-apple-darwin10.h index dd382f181ed3bb..7739eddddb44cf 100644 --- a/src/mono/mono/offsets/x86_64-apple-darwin10.h +++ b/src/mono/mono/offsets/x86_64-apple-darwin10.h @@ -45,7 +45,7 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,name_hash,132) +DECL_OFFSET2(MonoClass,name_hash,128) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) DECL_OFFSET2(MonoClass,fields,152) diff --git a/src/mono/mono/offsets/x86_64-apple-maccatalyst.h b/src/mono/mono/offsets/x86_64-apple-maccatalyst.h index 8c48308118eadf..e830a1f6a5b95f 100644 --- a/src/mono/mono/offsets/x86_64-apple-maccatalyst.h +++ b/src/mono/mono/offsets/x86_64-apple-maccatalyst.h @@ -46,7 +46,7 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,name_hash,132) +DECL_OFFSET2(MonoClass,name_hash,128) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) DECL_OFFSET2(MonoClass,fields,152) diff --git a/src/mono/mono/offsets/x86_64-none-linux-android.h b/src/mono/mono/offsets/x86_64-none-linux-android.h index 8e0fe860571f30..6801adfeb9f673 100644 --- a/src/mono/mono/offsets/x86_64-none-linux-android.h +++ b/src/mono/mono/offsets/x86_64-none-linux-android.h @@ -46,7 +46,7 @@ DECL_OFFSET2(MonoClass,interface_offsets_count,100) DECL_OFFSET2(MonoClass,interfaces_packed,104) DECL_OFFSET2(MonoClass,interface_offsets_packed,112) DECL_OFFSET2(MonoClass,interface_bitmap,120) -DECL_OFFSET2(MonoClass,name_hash,132) +DECL_OFFSET2(MonoClass,name_hash,128) DECL_OFFSET2(MonoClass,interfaces,136) DECL_OFFSET2(MonoClass,sizes,144) DECL_OFFSET2(MonoClass,fields,152)