Skip to content

Fix GC write barrier when writing async method return into continuation object #126721

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

Open
BrzVlad wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −2
Open

Fix GC write barrier when writing async method return into continuation object #126721

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
10 changes: 8 additions & 2 deletions src/coreclr/vm/interpexec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,9 +1064,15 @@ extern "C" ContinuationObject* AsyncHelpers_ResumeInterpreterContinuationWorker(
// We had a normal return, so copy out the return value
if (returnValueSize > 0)
{
if (pSuspendData->asyncMethodReturnType != NULL && pSuspendData->asyncMethodReturnType->ContainsGCPointers())
if (pSuspendData->asyncMethodReturnType != NULL && !pSuspendData->asyncMethodReturnType->IsValueType())
{
// GC refs need to be written with write barriers
// asyncMethodReturnType is set only for CORINFO_TYPE_VALUECLASS/STRING/CLASS
// so we can make the assumption that the return is an object reference if not valuetype
SetObjectReference((OBJECTREF*)resultStorage, ObjectToOBJECTREF(*(Object**)returnValueLocation));
}
else if (pSuspendData->asyncMethodReturnType != NULL && pSuspendData->asyncMethodReturnType->ContainsGCPointers())
{
// ValueType containing gc refs, needs to be written with write barriers
memmoveGCRefs(resultStorage, returnValueLocation, returnValueSize);
}
else
Expand Down
Loading