Skip to content

[mono][interp] Make sure containing klass has field offsets initialized #73264

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
radical merged 2 commits into from
Aug 3, 2022
Merged

[mono][interp] Make sure containing klass has field offsets initialized #73264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b83117
[mono][interp] Improve check for tiering enabled
BrzVlad Aug 2, 2022
84b10d7
[mono][interp] Make sure containing klass has field offsets initialized
BrzVlad Aug 2, 2022
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
2 changes: 1 addition & 1 deletion src/mono/mono/mini/interp/interp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ mono_interp_get_imethod (MonoMethod *method)
imethod->code_type = IMETHOD_CODE_UNKNOWN;
// always optimize code if tiering is disabled
// always optimize wrappers
if (!(mono_interp_opt & INTERP_OPT_TIERING) || method->wrapper_type != MONO_WRAPPER_NONE)
if (!mono_interp_tiering_enabled () || method->wrapper_type != MONO_WRAPPER_NONE)
imethod->optimized = TRUE;
if (imethod->method->string_ctor)
imethod->rtype = m_class_get_byval_arg (mono_defaults.string_class);
Expand Down
3 changes: 3 additions & 0 deletions src/mono/mono/mini/interp/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5900,6 +5900,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
MonoType *ftype = mono_field_get_type_internal (field);
gboolean is_static = !!(ftype->attrs & FIELD_ATTRIBUTE_STATIC);
mono_class_init_internal (klass);
mono_class_setup_fields (klass);
{
if (is_static) {
td->sp--;
Expand Down Expand Up @@ -5939,6 +5940,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
MonoType *ftype = mono_field_get_type_internal (field);
gboolean is_static = !!(ftype->attrs & FIELD_ATTRIBUTE_STATIC);
mono_class_init_internal (klass);
mono_class_setup_fields (klass);

MonoClass *field_klass = mono_class_from_mono_type_internal (ftype);
mt = mint_type (ftype);
Expand Down Expand Up @@ -6014,6 +6016,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
gboolean is_static = !!(ftype->attrs & FIELD_ATTRIBUTE_STATIC);
MonoClass *field_klass = mono_class_from_mono_type_internal (ftype);
mono_class_init_internal (klass);
mono_class_setup_fields (klass);
mt = mint_type (ftype);

BARRIER_IF_VOLATILE (td, MONO_MEMORY_BARRIER_REL);
Expand Down