This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
x86: Deactivate P/Invoke frames after a native call. #8464
Merged
Conversation
This file contains 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
Although this does not appear to be strictly necessary, this matches JIT32's behavior. With this change, the stack walker will ignore the P/Invoke frame even while it is still present on its thread's frame list. Fixes VSO 297109.
|
@BruceForstall @dotnet/jit-contrib PTAL |
|
|
briansull
reviewed
Dec 6, 2016
| @@ -2963,7 +2963,7 @@ void Lowering::InsertPInvokeCallEpilog(GenTreeCall* call) | |||
| BlockRange().InsertBefore(insertionPoint, LIR::SeqTree(comp, tree)); | |||
|
|
|||
| // Pop the frame if necessary. On 32-bit targets this only happens in the method epilog; on 64-bit targets thi | |||
There was a problem hiding this comment.
This conflict with what you added:
On 32-bit targets this only happens in the method epilog;
There was a problem hiding this comment.
There is a difference between popping and deactivating a frame: the latter removes the frame from its thread's frame list, while the former leaves the frame on the list but marks it s.t. the stack walker ignores it.
briansull
reviewed
Dec 6, 2016
| #else | ||
| const CORINFO_EE_INFO::InlinedCallFrameInfo& callFrameInfo = comp->eeGetEEInfo()->inlinedCallFrameInfo; | ||
|
|
||
| GenTreeLclFld* const storeCallSiteTracker = |
There was a problem hiding this comment.
A comment similar to this one should be added:
(This is the comment that is used when we setup this value in InsertPInvokeCallProlog)
// ----------------------------------------------------------------------------------
// InlinedCallFrame.m_pCallerReturnAddress = &label (the address of the instruction immediately following the call) // InlinedCallFrame.m_pCallerReturnAddress = &label (the address of the instruction immediately following the call)
picenka21
pushed a commit
to picenka21/runtime
that referenced
this pull request
Feb 18, 2022
x86: Deactivate P/Invoke frames after a native call. Commit migrated from dotnet/coreclr@b19ac36
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Although this does not appear to be strictly necessary, this matches
JIT32's behavior. With this change, the stack walker will ignore the
P/Invoke frame even while it is still present on its thread's frame
list.
Fixes VSO 297109.