Skip to content

Fix x86 async frame generic type resolution in DBI #126915

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
tommcdon merged 2 commits into from
Apr 15, 2026
+8 −2
Merged

Fix x86 async frame generic type resolution in DBI #126915

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd568c1
Fix x86 async frame generic type resolution in DBI
tommcdon Apr 14, 2026
dec1d91
Update src/coreclr/debug/di/rsthread.cpp
tommcdon Apr 15, 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
10 changes: 8 additions & 2 deletions src/coreclr/debug/di/rsthread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11525,8 +11525,14 @@ void CordbAsyncFrame::LoadGenericArgs()
{
if (m_asyncVars[i].ilVarNum == genericArgIndex)
{

HRESULT hr = GetProcess()->SafeReadStruct(m_continuationAddress + m_asyncVars[i].offset, &genericTypeParam);
// Read a target-pointer-sized value. CORDB_ADDRESS is always 8 bytes (ULONG64),
// but on x86 targets the generic arg field is only a 4-byte pointer. Using
// SIZE_T (which is pointer-sized for the DBI build, matching the target here)
// avoids reading adjacent memory. This mirrors how CordbJITILFrame::Init()
// reads the raw token via GetRegisterOrStackValue (which returns SIZE_T).
SIZE_T rawToken = 0;
HRESULT hr = GetProcess()->SafeReadStruct(m_continuationAddress + m_asyncVars[i].offset, &rawToken);
genericTypeParam = (CORDB_ADDRESS)rawToken;
IfFailThrow(hr);
break;
}
Expand Down
Loading