Skip to content

R2R skip return dropping thunks #127186

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
jtschuster merged 3 commits into from
Apr 28, 2026
+8 −4
Merged

R2R skip return dropping thunks #127186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a221c6
Don't try to find an R2R entrypoint for return-dropping thunks
jtschuster Apr 17, 2026
d15abc0
Re-enable covariant-return crossgen test
jtschuster Apr 20, 2026
c88b58e
Merge branch 'main' into r2r-skip-return-dropping-thunks
jtschuster Apr 27, 2026
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
8 changes: 8 additions & 0 deletions src/coreclr/vm/readytoruninfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,6 +1281,14 @@ PCODE ReadyToRunInfo::GetEntryPoint(MethodDesc * pMD, PrepareCodeConfig* pConfig
if (ReadyToRunCodeDisabled())
goto done;

// Return-dropping async thunks are VM-synthesized. They share the same metadata
// token and signature shape as a regular async variant, so the R2R lookup below
// would incorrectly bind the thunk to the non-thunk's compiled code and bypass
// the virtual dispatch the thunk performs. Crossgen2 does not emit R2R code for
// these thunks; fall back to transient IL generation in the prestub.
if (pMD->IsReturnDroppingThunk())
goto done;

ETW::MethodLog::GetR2RGetEntryPointStart(pMD);

uint offset;
Expand Down
4 changes: 0 additions & 4 deletions src/tests/async/covariant-return/covariant-returns.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- https://github.com/dotnet/runtime/issues/126755 -->
<CrossGenTest>false</CrossGenTest>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />
<ProjectReference Include="$(TestLibraryProjectPath)" />
Expand Down