Skip to content

[runtime] copy updated byref nullables after invoke #67652

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 2 commits into from
Apr 9, 2022
Merged

[runtime] copy updated byref nullables after invoke #67652

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
91c55ee
[runtime] copy updated byref nullables after invoke
lambdageek Apr 6, 2022
82e8f9b
remove ActiveIssue
lambdageek Apr 8, 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: 0 additions & 2 deletions src/libraries/System.Reflection/tests/MethodInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,6 @@ public void ToStringTest_ByMethodInfo(MethodInfo methodInfo, string expected)
Assert.Equal(expected, methodInfo.ToString());
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/67269", TestRuntimes.Mono)]
[Fact]
public void InvokeNullableRefs()
{
Expand Down Expand Up @@ -656,7 +655,6 @@ static MethodInfo GetMethod(string name) => typeof(NullableRefMethods).GetMethod
name, BindingFlags.Public | BindingFlags.Static)!;
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/67269", TestRuntimes.Mono)]
[Fact]
public void InvokeBoxedNullableRefs()
{
Expand Down
14 changes: 14 additions & 0 deletions src/mono/mono/metadata/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4841,6 +4841,20 @@ mono_runtime_try_invoke_span (MonoMethod *method, void *obj, MonoSpanOfObjects *
g_assert (box_exc == NULL);
mono_error_assert_ok (error);
}

if (has_byref_nullables) {
/*
* The runtime invoke wrapper already converted byref nullables back,
* and stored them in pa, we just need to copy them back to the
* managed array.
*/
for (i = 0; i < params_length; i++) {
MonoType *t = sig->params [i];

if (m_type_is_byref (t) && t->type == MONO_TYPE_GENERICINST && mono_class_is_nullable (mono_class_from_mono_type_internal (t)))
mono_span_setref (params_span, i, pa [i]);
}
}
}
goto exit;
exit_null:
Expand Down