Skip to content

Enable new exception handling on win-x86 #115957

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
merged 9 commits into from
May 26, 2025
Merged

Enable new exception handling on win-x86 #115957

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
091d21c
Change win-x86 configuration to build with FEATURE_EH_FUNCLETS
filipnavara Apr 2, 2025
0f0d750
Update CLR ABI document
filipnavara May 24, 2025
358970f
Bump R2R version
filipnavara May 24, 2025
7a2bb27
Update JIT-EE interface GUID
filipnavara May 24, 2025
cdbe9d2
Report funclet prologs and epilogs as no-GC regions in x86 GC info
filipnavara May 24, 2025
b9cd5ac
Fix isFilterFunclet code path in EnumGcRefsX86
filipnavara May 25, 2025
f21b675
Implement ShouldParentToFuncletUseUnwindTargetLocationForGCReporting …
filipnavara May 25, 2025
58f1050
Fix hasReversePInvoke condition not to trigger when unwinding from fu…
filipnavara May 25, 2025
03b9eeb
Cleanup usages of WantsReportOnlyLeaf
filipnavara May 25, 2025
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
6 changes: 3 additions & 3 deletions src/coreclr/jit/emitinl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,15 +585,15 @@ inline bool insIsCMOV(instruction ins)
* false. Returns the final result of the callback.
*/
template <typename Callback>
bool emitter::emitGenNoGCLst(Callback& cb, bool skipAllPrologsAndEpilogs /* = false */)
bool emitter::emitGenNoGCLst(Callback& cb, bool skipMainPrologsAndEpilogs /* = false */)
{
for (insGroup* ig = emitIGlist; ig; ig = ig->igNext)
{
if (skipAllPrologsAndEpilogs)
if (skipMainPrologsAndEpilogs)
{
if (ig == emitPrologIG)
continue;
if (ig->igFlags & (IGF_EPILOG | IGF_FUNCLET_PROLOG | IGF_FUNCLET_EPILOG))
if (ig->igFlags & IGF_EPILOG)
continue;
}
if ((ig->igFlags & IGF_NOGCINTERRUPT) && ig->igSize > 0)
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/emitpub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ unsigned emitEndCodeGen(Compiler* comp,
unsigned emitGetEpilogCnt();

template <typename Callback>
bool emitGenNoGCLst(Callback& cb, bool skipAllPrologsAndEpilogs = false);
bool emitGenNoGCLst(Callback& cb, bool skipMainPrologsAndEpilogs = false);

void emitBegProlog();
unsigned emitGetPrologOffsetEstimate();
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/gcencode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2223,7 +2223,7 @@ size_t GCInfo::gcMakeRegPtrTable(BYTE* dest, int mask, const InfoHdr& header, un
if (header.noGCRegionCnt != 0)
{
NoGCRegionEncoder encoder(mask != 0 ? dest : NULL);
compiler->GetEmitter()->emitGenNoGCLst(encoder, /* skipAllPrologsAndEpilogs = */ true);
compiler->GetEmitter()->emitGenNoGCLst(encoder, /* skipMainPrologsAndEpilogs = */ true);
totalSize += encoder.totalSize;
if (mask != 0)
dest += encoder.totalSize;
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/gcinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ void GCInfo::gcCountForHeader(UNALIGNED unsigned int* pUntrackedCount,
if (compiler->codeGen->GetInterruptible())
{
NoGCRegionCounter counter;
compiler->GetEmitter()->emitGenNoGCLst(counter, /* skipAllPrologsAndEpilogs = */ true);
compiler->GetEmitter()->emitGenNoGCLst(counter, /* skipMainPrologsAndEpilogs = */ true);
noGCRegionCount = counter.noGCRegionCount;
}

Expand Down
Loading