[x86/Linux] Fix EnclosingClauseCallerSP#9607
Conversation
|
Test results on x86 version : master w/ #9601 version : master w/ #9601 and this PR |
| _ASSERTE(pRD->IsCallerContextValid || pRD->IsCallerSPValid); | ||
| UINT_PTR EnclosingClauseCallerSP = (UINT_PTR)GetSP(pRD->pCallerContext); | ||
| #else // !_ARM_ && !_AMD64_ && !_ARM64_ | ||
| #else // !_ARM_ && !_AMD64_ && !_ARM64_ && !_X86_ |
There was a problem hiding this comment.
A nit - can you please fix the comment to reflect the real define names (_TARGET_XXX_)?
| UINT_PTR EnclosingClauseCallerSP = (UINT_PTR)pDispatcherContext->EstablisherFrame; | ||
| #elif defined(_TARGET_AMD64_) | ||
| // Extract the CallerSP from RegDisplay on AMD64 | ||
| #elif defined(_TARGET_AMD64_) || defined(_TARGET_X86_) |
There was a problem hiding this comment.
I am not sure if we want to use the ARM or AMD64 way for x86 - did we already make a choice in this matter? I
If we follow the amd64 way, then we also need to fix the code here:
https://github.com/dotnet/coreclr/blob/master/src/vm/exceptionhandling.cpp#L2843-L2849
and here:
https://github.com/dotnet/coreclr/blob/master/src/vm/exceptionhandling.cpp#L3109-L3115
(and if not, we should modify the comments at those places to mention x86).
|
@dotnet-bot test this please (Jenkins was down) |
|
Closing since #9814 handles this. |
5 participants
Seems like this is missing part of x86/linux port.