Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/mono/mono/metadata/object.c
Original file line number Diff line number Diff line change
Expand Up @@ -906,9 +906,13 @@ compute_class_bitmap (MonoClass *klass, gsize *bitmap, int size, int offset, int

guint32 field_iter = 1;
guint32 field_instance_offset = field_offset;
int field_size = 0;
// If struct has InlineArray attribute, iterate `length` times to set a bitmap
if (m_class_is_inlinearray (p))
if (m_class_is_inlinearray (p)) {
int align;
field_iter = m_class_inlinearray_value (p);
field_size = mono_type_size (field->type, &align);
}

if (field_iter > 500)
g_warning ("Large number of iterations detected when creating a GC bitmap, might affect performance.");
Expand Down Expand Up @@ -973,7 +977,7 @@ compute_class_bitmap (MonoClass *klass, gsize *bitmap, int size, int offset, int
break;
}

field_instance_offset += field_offset;
field_instance_offset += field_size;
field_iter--;
}
}
Expand Down
Loading