Skip to content

JIT: better support for patchpoints in try regions #59784

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
AndyAyersMS merged 5 commits into from
Oct 6, 2021
Merged

JIT: better support for patchpoints in try regions #59784

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35b32e0
JIT: better support for patchpoints in try regions
AndyAyersMS Sep 27, 2021
b615748
Merge remote-tracking branch 'upstream/main' into FixMidTryPatchpoint…
AndyAyersMS Oct 1, 2021
302d2bc
need to set up the lookup table differently
AndyAyersMS Oct 4, 2021
c362498
handle mutual protect no step block case
AndyAyersMS Oct 5, 2021
0094352
cleanup naming and add more detail on the osr transform
AndyAyersMS Oct 5, 2021
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
need to set up the lookup table differently
  • Loading branch information
@AndyAyersMS
AndyAyersMS committed Oct 4, 2021
commit 302d2bc4cfc14029614d59459be7aa1028c11996
8 changes: 4 additions & 4 deletions src/coreclr/jit/fgbasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3539,6 +3539,10 @@ void Compiler::fgFindBasicBlocks()
//
void Compiler::fgFixEntryFlowForOSR()
{
// Ensure lookup IL->BB lookup table is valid
//
fgInitBBLookup();

// Remember the original entry block in case this method is tail recursive.
//
fgEntryBB = fgLookupBB(0);
Expand All @@ -3561,10 +3565,6 @@ void Compiler::fgFixEntryFlowForOSR()

JITDUMP("OSR: redirecting flow at entry from entry " FMT_BB " to OSR entry " FMT_BB " for the importer\n",
fgFirstBB->bbNum, osrEntry->bbNum);

// rebuild lookup table... we may be able to avoid this by leaving room up front.
//
fgInitBBLookup();
}

/*****************************************************************************
Expand Down