Skip to content

[Memory Snapshot][2018.3] Metadata crawling, use only initialized types #1088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2018
Merged

[Memory Snapshot][2018.3] Metadata crawling, use only initialized types #1088

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions mono/metadata/unity-memory-info.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ContextRecurseClassData(CollectMetadataContext *context, MonoClass *klass)
* If we use g_hash_table_lookup it returns the value which we were comparing to NULL. The problem is
* that 0 is a valid class index and was confusing our logic.
*/
if (!g_hash_table_lookup_extended(context->allTypes, klass, &orig_key, &value)) {
if (klass->inited && !g_hash_table_lookup_extended(context->allTypes, klass, &orig_key, &value)) {
g_hash_table_insert(context->allTypes, klass, GINT_TO_POINTER(context->currentIndex++));

fieldCount = mono_class_num_fields(klass);
Expand Down Expand Up @@ -184,10 +184,7 @@ AddMetadataType(gpointer key, gpointer value, gpointer user_data)
MonoMetadataField *metaField = &type->fields[type->fieldCount];
MonoClass *typeKlass = mono_class_from_mono_type(field->type);

if (typeKlass->rank > 0)
metaField->typeIndex = FindClassIndex(context->allTypes, mono_class_get_element_class(typeKlass));
else
metaField->typeIndex = FindClassIndex(context->allTypes, typeKlass);
metaField->typeIndex = FindClassIndex(context->allTypes, typeKlass);

// This will happen if fields type is not initialized
// It's OK to skip it, because it means the field is guaranteed to be null on any object
Expand Down