Skip to content

2021.3: Avoid throwing TypeLoadException for generic 2D arrays (case UUM-34854) #1779

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
Jun 12, 2023
Merged

2021.3: Avoid throwing TypeLoadException for generic 2D arrays (case UUM-34854) #1779

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
6 changes: 4 additions & 2 deletions mono/metadata/class-init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,8 +1124,10 @@ mono_class_create_bounded_array (MonoClass *eclass, guint32 rank, gboolean bound

mono_class_setup_supertypes (klass);

if (mono_class_is_ginst (eclass))
mono_class_init_internal (eclass);
// NOTE: this is probably too aggressive if eclass is not a valuetype. It looks like we
// only need the size info in order to set MonoClass:has_references for this array type -
// and for that we only need to setup the fields of the element type if it's not a reference
// type.
if (!eclass->size_inited)
mono_class_setup_fields (eclass);
mono_class_set_type_load_failure_causedby_class (klass, eclass, "Could not load array element type");
Expand Down