Skip to content

Delete CORINFO_HELP_ENDCATCH #124820

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
jkotas merged 2 commits into from
Feb 25, 2026
+8 −27
Merged

Delete CORINFO_HELP_ENDCATCH #124820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bba43d3
Delete CORINFO_HELP_ENDCATCH
jkotas Jan 19, 2026
0f246c6
Fix
jkotas Feb 24, 2026
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
2 changes: 0 additions & 2 deletions src/coreclr/inc/corinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,6 @@ enum CorInfoHelpFunc
CORINFO_HELP_FIELD_ACCESS_EXCEPTION,
CORINFO_HELP_CLASS_ACCESS_EXCEPTION,

CORINFO_HELP_ENDCATCH, // call back into the EE at the end of a catch block

/* Synchronization */

CORINFO_HELP_MON_ENTER,
Expand Down
10 changes: 5 additions & 5 deletions src/coreclr/inc/jiteeversionguid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@

#include <minipal/guid.h>

constexpr GUID JITEEVersionIdentifier = { /* 4379bd40-8b3b-4643-a6da-cb62e55e2e6c */
0x4379bd40,
0x8b3b,
0x4643,
{0xa6, 0xda, 0xcb, 0x62, 0xe5, 0x5e, 0x2e, 0x6c}
constexpr GUID JITEEVersionIdentifier = { /* cd664ea4-e14e-4fd4-9cb8-e8fc1e1b5a0a */
0xcd664ea4,
0xe14e,
0x4fd4,
{0x9c, 0xb8, 0xe8, 0xfc, 0x1e, 0x1b, 0x5a, 0x0a}
};

#endif // JIT_EE_VERSIONING_GUID_H
2 changes: 0 additions & 2 deletions src/coreclr/inc/jithelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,6 @@
DYNAMICJITHELPER(CORINFO_HELP_FIELD_ACCESS_EXCEPTION, NULL, METHOD__THROWHELPERS__THROWFIELDACCESSEXCEPTION)
DYNAMICJITHELPER(CORINFO_HELP_CLASS_ACCESS_EXCEPTION, NULL, METHOD__THROWHELPERS__THROWCLASSACCESSEXCEPTION)

JITHELPER(CORINFO_HELP_ENDCATCH, NULL, METHOD__NIL)

DYNAMICJITHELPER(CORINFO_HELP_MON_ENTER, NULL, METHOD__MONITOR__SYNCHRONIZED_METHOD_ENTER)
DYNAMICJITHELPER(CORINFO_HELP_MON_EXIT, NULL, METHOD__MONITOR__SYNCHRONIZED_METHOD_EXIT)

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/inc/readytorun.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ enum ReadyToRunHelper
READYTORUN_HELPER_CheckedWriteBarrier_EBP = 0x10B,

// JIT32 x86-specific exception handling
READYTORUN_HELPER_EndCatch = 0x110,
READYTORUN_HELPER_EndCatch = 0x110, // Unused since READYTORUN_MAJOR_VERSION 14.0

// Stack probing helper
READYTORUN_HELPER_StackProbe = 0x111,
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/inc/readytorunhelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ HELPER(READYTORUN_HELPER_CheckedWriteBarrier_ECX, CORINFO_HELP_CHECKED_ASSIGN_
HELPER(READYTORUN_HELPER_CheckedWriteBarrier_ESI, CORINFO_HELP_CHECKED_ASSIGN_REF_ESI, )
HELPER(READYTORUN_HELPER_CheckedWriteBarrier_EDI, CORINFO_HELP_CHECKED_ASSIGN_REF_EDI, )
HELPER(READYTORUN_HELPER_CheckedWriteBarrier_EBP, CORINFO_HELP_CHECKED_ASSIGN_REF_EBP, )

HELPER(READYTORUN_HELPER_EndCatch, CORINFO_HELP_ENDCATCH, OPTIMIZEFORSIZE)
#endif

HELPER(READYTORUN_HELPER_PInvokeBegin, CORINFO_HELP_JIT_PINVOKE_BEGIN, )
Expand Down
7 changes: 0 additions & 7 deletions src/coreclr/jit/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,13 +1546,6 @@ void HelperCallProperties::init()
exceptions = ExceptionSetFlags::None;
break;

// Arithmetic helpers that *can* throw.

// This (or these) are not pure, in that they have "VM side effects"...but they don't mutate the heap.
case CORINFO_HELP_ENDCATCH:
exceptions = ExceptionSetFlags::None;
break;

// Arithmetic helpers that may throw
case CORINFO_HELP_LMOD: // Mods throw div-by zero, and signed mods have problems with the smallest integer
// mod -1,
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/tools/Common/Internal/Runtime/MetadataBlob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ internal enum ReflectionMapBlob
ByRefTypeMap = 11,
// unused = 12,
EmbeddedMetadata = 13,
// Unused = 14,
UnboxingAndInstantiatingStubMap = 15,
// unused = 14,
// unused = 15,
StructMarshallingStubMap = 16,
DelegateMarshallingStubMap = 17,
GenericVirtualMethodTable = 18,
Expand Down
2 changes: 0 additions & 2 deletions src/coreclr/tools/Common/JitInterface/CorInfoHelpFunc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ which is the right helper to use to allocate an object of a given type. */
CORINFO_HELP_FIELD_ACCESS_EXCEPTION,
CORINFO_HELP_CLASS_ACCESS_EXCEPTION,

CORINFO_HELP_ENDCATCH, // call back into the EE at the end of a catch block

/* Synchronization */

CORINFO_HELP_MON_ENTER,
Expand Down
4 changes: 0 additions & 4 deletions src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,10 +1215,6 @@ private ISymbolNode GetHelperFtnUncached(CorInfoHelpFunc ftnNum)
id = ReadyToRunHelper.CheckedWriteBarrier_EBP;
break;

case CorInfoHelpFunc.CORINFO_HELP_ENDCATCH:
id = ReadyToRunHelper.EndCatch;
break;

case CorInfoHelpFunc.CORINFO_HELP_JIT_PINVOKE_BEGIN:
id = ReadyToRunHelper.PInvokeBegin;
break;
Expand Down
Loading