Skip to content

Revert "[release/9.0-staging] Fix crash during Async Break when APC and CET are enabled" #116015

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.

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

Conversation

thaystg
Copy link
Member

@thaystg thaystg commented May 27, 2025

Reverts #114932

@Copilot Copilot AI review requested due to automatic review settings May 27, 2025 15:15
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

Reverts a previous commit that fixed a crash during Async Break when APC and CET are enabled, restoring the pre-change behavior.

  • Reintroduces the original flow by removing the additional APC handling code.
  • Adjusts function signatures and friend declarations to match the restored implementation.
  • Removes the SingleStepToExitApcCall functionality from multiple modules.

Reviewed Changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.

Show a summary per file
File Description
src/coreclr/vm/threadsuspend.cpp Removed APC-related code blocks and reverted the HandleSuspensionForInterruptedThread signature.
src/coreclr/vm/threads.h Removed friend declaration and commented out unused thread state flags related to APC handling.
src/coreclr/vm/dbginterface.h Deleted declaration of SingleStepToExitApcCall.
src/coreclr/debug/ee/debugger.h and .cpp Removed the implementation of SingleStepToExitApcCall.
src/coreclr/debug/ee/controller.cpp Eliminated the branch that handled TS_SSToExitApcCall logic during exception dispatch.

Copy link
Member

@jeffschwMSFT jeffschwMSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved. this is a revert of a change that has not yet shipped as part of 9.0.x. we have already reverted in .NET 10 preview 5. please get a code review and merge when ready

@jeffschwMSFT jeffschwMSFT added this to the 9.0.x milestone Jun 2, 2025
Copy link
Contributor

Tagging subscribers to this area: @tommcdon
See info in area-owners.md if you want to be subscribed.

@thaystg thaystg merged commit c7e6e39 into release/9.0-staging Jun 2, 2025
95 of 96 checks passed
@jkotas jkotas deleted the revert-114932-dev/thays/backport_111408 branch June 8, 2025 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants