Revert "[release/9.0-staging] Fix crash during Async Break when APC and CET are enabled"#116015
Merged
thaystg merged 1 commit intorelease/9.0-stagingfrom Jun 2, 2025
Merged
Conversation
…nd CET a…" This reverts commit 753e467.
Contributor
There was a problem hiding this comment.
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. |
jeffschwMSFT
approved these changes
Jun 2, 2025
Member
jeffschwMSFT
left a comment
jeffschwMSFT
left a comment
There was a problem hiding this comment.
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
added
Servicing-approved
Contributor
|
Tagging subscribers to this area: @tommcdon |
tommcdon
approved these changes
Jun 2, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts #114932