Skip to content
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

Jump to bottom

[7.0] Fix the tiering delay to account for changing IL/native code versions during the delay #78669

Merged
merged 1 commit into from
Nov 29, 2022
Merged

[7.0] Fix the tiering delay to account for changing IL/native code versions during the delay #78669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions src/coreclr/vm/tieredcompilation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,10 +593,17 @@ bool TieredCompilationManager::TryDeactivateTieringDelay()
continue;
}

PCODE codeEntryPoint = activeCodeVersion.GetNativeCode();
if (codeEntryPoint == NULL)
{
// The active IL/native code version has changed since the method was queued, and the currently active version
// doesn't have a code entry point yet
continue;
}

EX_TRY
{
bool wasSet =
CallCountingManager::SetCodeEntryPoint(activeCodeVersion, activeCodeVersion.GetNativeCode(), false, nullptr);
bool wasSet = CallCountingManager::SetCodeEntryPoint(activeCodeVersion, codeEntryPoint, false, nullptr);
_ASSERTE(wasSet);
}
EX_CATCH
Expand Down