Skip to content

[interp] Don't share interp_in signatures for different valuetypes #36520

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
BrzVlad merged 1 commit into from
May 16, 2020
Merged

[interp] Don't share interp_in signatures for different valuetypes #36520

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
17 changes: 14 additions & 3 deletions src/mono/mono/mini/mini-generic-sharing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,8 +1335,10 @@ get_wrapper_shared_type (MonoType *t)

/* Returns the intptr type for types that are passed in a single register */
static MonoType*
get_wrapper_shared_type_reg (MonoType *t)
get_wrapper_shared_type_reg (MonoType *t, gboolean pinvoke)
{
MonoType *orig_t = t;

t = get_wrapper_shared_type (t);
if (t->byref)
return t;
Expand Down Expand Up @@ -1364,6 +1366,15 @@ get_wrapper_shared_type_reg (MonoType *t)
case MONO_TYPE_ARRAY:
case MONO_TYPE_PTR:
return mono_get_int_type ();
case MONO_TYPE_GENERICINST:
if (orig_t->type == MONO_TYPE_VALUETYPE && pinvoke)
/*
* These are translated to instances of Mono.ValueTuple, but generic types
* cannot be passed in pinvoke.
*/
return orig_t;
else
return t;
default:
return t;
}
Expand All @@ -1375,9 +1386,9 @@ mini_get_underlying_reg_signature (MonoMethodSignature *sig)
MonoMethodSignature *res = mono_metadata_signature_dup (sig);
int i;

res->ret = get_wrapper_shared_type_reg (sig->ret);
res->ret = get_wrapper_shared_type_reg (sig->ret, sig->pinvoke);
for (i = 0; i < sig->param_count; ++i)
res->params [i] = get_wrapper_shared_type_reg (sig->params [i]);
res->params [i] = get_wrapper_shared_type_reg (sig->params [i], sig->pinvoke);
res->generic_param_count = 0;
res->is_inflated = 0;

Expand Down