Skip to content

[release/10.0] Fix ARM64 ThreadAbort issue #120579

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
Oct 14, 2025
Merged

[release/10.0] Fix ARM64 ThreadAbort issue #120579

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions src/coreclr/vm/amd64/cgenamd64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ void ResumableFrame::UpdateRegDisplay_Impl(const PREGDISPLAY pRD, bool updateFlo
CONTRACT_END;

CopyMemory(pRD->pCurrentContext, m_Regs, sizeof(CONTEXT));
// Clear the CONTEXT_XSTATE, since the REGDISPLAY contains just plain CONTEXT structure
pRD->pCurrentContext->ContextFlags &= ~(CONTEXT_XSTATE & CONTEXT_AREA_MASK);

pRD->ControlPC = m_Regs->Rip;

Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/vm/arm64/stubs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,8 @@ void ResumableFrame::UpdateRegDisplay_Impl(const PREGDISPLAY pRD, bool updateFlo
CONTRACT_END;

CopyMemory(pRD->pCurrentContext, m_Regs, sizeof(T_CONTEXT));
// Clear the CONTEXT_XSTATE, since the REGDISPLAY contains just plain CONTEXT structure
pRD->pCurrentContext->ContextFlags &= ~(CONTEXT_XSTATE & CONTEXT_AREA_MASK);

pRD->ControlPC = m_Regs->Pc;
pRD->SP = m_Regs->Sp;
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/vm/threads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7686,6 +7686,7 @@ void ClrRestoreNonvolatileContext(PCONTEXT ContextRecord, size_t targetSSP)
// Falling back to RtlRestoreContext() for now, though it should be possible to have simpler variants for these cases
RtlRestoreContext(ContextRecord, NULL);
#endif
UNREACHABLE();
}

#ifdef FEATURE_INTERPRETER
Expand Down
Loading