Skip to content

[release/7.0] Preserve last error for patchpoint helpers #76200

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.

Sign up for GitHub

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
carlossanlop merged 3 commits into from
Sep 27, 2022
Merged

[release/7.0] Preserve last error for patchpoint helpers #76200

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e87edfa
Preserve last error for patchpoint helpers
AndyAyersMS Sep 20, 2022
51bb3e7
fix build issues, review feedback
AndyAyersMS Sep 20, 2022
7d398e2
add test case
AndyAyersMS Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix build issues, review feedback
  • Loading branch information
@AndyAyersMS
AndyAyersMS authored and github-actions committed Sep 26, 2022
commit 51bb3e72fdfad0a93ea8bd2d626944f3144e2a94
15 changes: 8 additions & 7 deletions src/coreclr/vm/jithelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4917,7 +4917,7 @@ HCIMPLEND
void JIT_Patchpoint(int* counter, int ilOffset)
{
// BEGIN_PRESERVE_LAST_ERROR;
DWORD __dwLastError = ::GetLastError();
DWORD dwLastError = ::GetLastError();

// This method may not return normally
STATIC_CONTRACT_GC_NOTRIGGER;
Expand All @@ -4932,6 +4932,8 @@ void JIT_Patchpoint(int* counter, int ilOffset)
LoaderAllocator* allocator = pMD->GetLoaderAllocator();
OnStackReplacementManager* manager = allocator->GetOnStackReplacementManager();
PerPatchpointInfo * ppInfo = manager->GetPerPatchpointInfo(ip);
PCODE osrMethodCode = NULL;
bool isNewMethod = false;

// In the current prototype, counter is shared by all patchpoints
// in a method, so no matter what happens below, we don't want to
Expand Down Expand Up @@ -4963,8 +4965,7 @@ void JIT_Patchpoint(int* counter, int ilOffset)
}

// See if we have an OSR method for this patchpoint.
PCODE osrMethodCode = ppInfo->m_osrMethodCode;
bool isNewMethod = false;
osrMethodCode = ppInfo->m_osrMethodCode;

if (osrMethodCode == NULL)
{
Expand Down Expand Up @@ -5197,7 +5198,7 @@ void JIT_Patchpoint(int* counter, int ilOffset)

// Restore last error (since call below does not return)
// END_PRESERVE_LAST_ERROR;
::SetLastError(__dwLastError);
::SetLastError(dwLastError);

// Transition!
ClrRestoreNonvolatileContext(pFrameContext);
Expand All @@ -5206,7 +5207,7 @@ void JIT_Patchpoint(int* counter, int ilOffset)
DONE:

// END_PRESERVE_LAST_ERROR;
::SetLastError(__dwLastError);
::SetLastError(dwLastError);
}

// Jit helper invoked at a partial compilation patchpoint.
Expand All @@ -5221,7 +5222,7 @@ void JIT_Patchpoint(int* counter, int ilOffset)
void JIT_PartialCompilationPatchpoint(int ilOffset)
{
// BEGIN_PRESERVE_LAST_ERROR;
DWORD __dwLastError = ::GetLastError();
DWORD dwLastError = ::GetLastError();

// This method will not return normally
STATIC_CONTRACT_GC_NOTRIGGER;
Expand Down Expand Up @@ -5376,7 +5377,7 @@ void JIT_PartialCompilationPatchpoint(int ilOffset)

// Restore last error (since call below does not return)
// END_PRESERVE_LAST_ERROR;
::SetLastError(__dwLastError);
::SetLastError(dwLastError);

// Transition!
RtlRestoreContext(&frameContext, NULL);
Expand Down