Skip to content

Fix interpreter passing managed "this" in presence of return buffer #117661

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 1 commit into from
Jul 16, 2025
Merged

Fix interpreter passing managed "this" in presence of return buffer #117661

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
19 changes: 2 additions & 17 deletions src/coreclr/vm/callstubgenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,23 +1417,8 @@ void CallStubGenerator::ComputeCallStub(MetaSig &sig, PCODE *pRoutines)
#endif
// The "this" argument register is not enumerated by the arg iterator, so
// we need to "inject" it here.
#if defined(TARGET_WINDOWS) && defined(TARGET_AMD64)
if (argIt.HasRetBuffArg())
{
#if LOG_COMPUTE_CALL_STUB
printf("argIt.HasRetBuffArg() on WINDOWS AMD64\n");
#endif
// The return buffer on Windows AMD64 is passed in the first argument register, so the
// "this" argument is be passed in the second argument register.
m_r1 = 1;
m_r2 = 1;
}
else
#endif // TARGET_WINDOWS && TARGET_AMD64
{
// The "this" pointer is passed in the first argument register.
m_r1 = 0;
}
// CLR ABI specifies that unlike the native Windows x64 calling convention, it is passed in the first argument register.
m_r1 = 0;
}

if (argIt.HasParamType())
Expand Down
Loading