Fix handling exceptions from native code when interpreted #121212
+47
−12
Conversation
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
There were two issues. One is that the SfiNextWorker was incorrectly advancing the stack frame iterator in case the interpreter was called from CallDescrWorker in some cases. The second was that the call to MethodDesc::GetMethodDescOfVirtualizedCode that is made by the InterpExecMethod can end up running managed code and throw managed exception. So it needs to have PAL_TRY/PAL_EXCEPT around the invocation, since the main loop of the interpreter can only catch and process C++ exceptions.
|
Tagging subscribers to this area: @BrzVlad, @janvorli, @kg |
There was a problem hiding this comment.
Pull Request Overview
This PR improves exception handling in the CoreCLR interpreter by:
- Wrapping calls to
GetMethodDescOfVirtualizedCodein a new helper function that properly handles both C++ and managed exceptions - Refining the stack frame iteration logic to correctly distinguish between managed and native callers during exception unwinding
Key changes:
- Introduces
CallGetMethodDescOfVirtualizedCodewrapper function for proper exception handling - Updates virtual call and delegate invocation sites to use the new wrapper
- Improves exception handling logic to check if return addresses point to managed code before advancing the stack frame iterator
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/coreclr/vm/interpexec.cpp | Adds CallGetMethodDescOfVirtualizedCode wrapper function and updates two call sites to use it for proper exception handling |
| src/coreclr/vm/exceptionhandling.cpp | Refines stack frame unwinding logic to properly distinguish managed from native callers using ExecutionManager::IsManagedCode |
| // The caller is a managed code, so we can update the regdisplay to point to it. | ||
| pInterpreterFrame->UpdateRegDisplay(pThis->m_crawl.GetRegisterSet(), /* updateFloats */ true); | ||
| } | ||
| // The caller of the interpreted code is a managed code |
There was a problem hiding this comment.
Comment should say 'is managed code' rather than 'is a managed code' for consistency with line 3985.
Suggested change
| // The caller of the interpreted code is a managed code | |
| // The caller of the interpreted code is managed code |
Comment on lines
+3975
to
+3981
| if (ExecutionManager::IsManagedCode(returnAddress)) | ||
| { | ||
| // The caller is a managed code, so we can update the regdisplay to point to it. | ||
| pInterpreterFrame->UpdateRegDisplay(pThis->m_crawl.GetRegisterSet(), /* updateFloats */ true); | ||
| } | ||
| // The caller of the interpreted code is a managed code | ||
| retVal = pThis->Next(); | ||
| _ASSERTE(retVal != SWA_FAILED); | ||
| _ASSERTE(pThis->GetFrameState() == StackFrameIterator::SFITER_FRAMELESS_METHOD); | ||
| isNativeTransition = false; |
There was a problem hiding this comment.
The comment at line 3977 should explain why we call Next() when the caller is managed code, to clarify that we're advancing to the managed caller frame. Consider expanding: 'The caller of the interpreted code is managed code, so advance to that frame.'
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
There were two issues. One is that the
SfiNextWorkerwas incorrectly advancing the stack frame iterator in case the interpreter was called fromCallDescrWorkerInternalin some cases.The second was that the call to
MethodDesc::GetMethodDescOfVirtualizedCodethat is made by theInterpExecMethodcan end up running managed code and throw managed exception. So it needs to have PAL_TRY/PAL_EXCEPT around the invocation, since the main loop of the interpreter can only catch and process C++ exceptions.This fixes the
Loader\classloader\regressions\vsw529206\vsw529206ModuleCctortest.