Skip to content
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

[mono][interp] Fix some leaks during compilation #97143

Merged
merged 2 commits into from
Jan 18, 2024
Merged

[mono][interp] Fix some leaks during compilation #97143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10e7596
[mono][interp] Stop trying to inflate signature
BrzVlad Jan 18, 2024
1158ea0
[mono][interp] Free mheader in case of inline failure
BrzVlad Jan 18, 2024
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
22 changes: 11 additions & 11 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 @@ -3103,6 +3103,7 @@ interp_inline_newobj (TransformData *td, MonoMethod *target_method, MonoMethodSi
int dreg, this_reg = -1;
int prev_sp_offset;
MonoClass *klass = target_method->klass;
MonoMethodHeader *mheader = NULL;

if (!(mono_interp_opt & INTERP_OPT_INLINE) ||
!interp_method_check_inlining (td, target_method, csignature))
Expand Down Expand Up @@ -3166,7 +3167,7 @@ interp_inline_newobj (TransformData *td, MonoMethod *target_method, MonoMethodSi
if (is_protected)
newobj_fast->flags |= INTERP_INST_FLAG_PROTECTED_NEWOBJ;

MonoMethodHeader *mheader = interp_method_get_header (target_method, error);
mheader = interp_method_get_header (target_method, error);
goto_if_nok (error, fail);

if (!interp_inline_method (td, target_method, mheader, error))
Expand All @@ -3180,6 +3181,7 @@ interp_inline_newobj (TransformData *td, MonoMethod *target_method, MonoMethodSi
push_var (td, dreg);
return TRUE;
fail:
mono_metadata_free_mh (mheader);
// Restore the state
td->sp = td->stack + prev_sp_offset;
td->last_ins = prev_last_ins;
Expand Down Expand Up @@ -3214,10 +3216,14 @@ interp_constrained_box (TransformData *td, MonoClass *constrained_class, MonoMet
static MonoMethod*
interp_get_method (MonoMethod *method, guint32 token, MonoImage *image, MonoGenericContext *generic_context, MonoError *error)
{
if (method->wrapper_type == MONO_WRAPPER_NONE)
if (method->wrapper_type == MONO_WRAPPER_NONE) {
return mono_get_method_checked (image, token, NULL, generic_context, error);
else
return (MonoMethod *)mono_method_get_wrapper_data (method, token);
} else {
MonoMethod *target_method = mono_method_get_wrapper_data (method, token);
if (generic_context)
target_method = mono_class_inflate_generic_method_checked (target_method, generic_context, error);
return target_method;
}
}

/*
Expand Down Expand Up @@ -3440,13 +3446,6 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
target_method = interp_get_method (method, token, image, generic_context, error);
return_val_if_nok (error, FALSE);
csignature = mono_method_signature_internal (target_method);

if (generic_context) {
csignature = mono_inflate_generic_signature (csignature, generic_context, error);
return_val_if_nok (error, FALSE);
target_method = mono_class_inflate_generic_method_checked (target_method, generic_context, error);
return_val_if_nok (error, FALSE);
}
}
} else {
csignature = mono_method_signature_internal (target_method);
Expand Down Expand Up @@ -3654,6 +3653,7 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
td->ip += 5;
goto done;
}
mono_metadata_free_mh (mheader);
}

/*
Expand Down