Skip to content

[r2r] Add helpers for class init #124649

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

Open
BrzVlad wants to merge 2 commits into
base: main
Choose a base branch
from
+23 −1
Open

[r2r] Add helpers for class init #124649

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
8808ed5
[r2r] Add helpers for class init
BrzVlad Feb 19, 2026
6ed21e3
review
BrzVlad Feb 23, 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
5 changes: 4 additions & 1 deletion src/coreclr/inc/readytorun.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
// and handle pending work.
#define READYTORUN_MAJOR_VERSION 18
#define READYTORUN_MINOR_VERSION 0x0001
#define READYTORUN_MINOR_VERSION 0x0002
Copy link
Member

@jkotas jkotas Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This number is in multiple places - see comment above


#define MINIMUM_READYTORUN_MAJOR_VERSION 18
Copy link
Member

@jkotas jkotas Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add comment below " R2R Version 18.1 adds InitClass and InitInstClass helpers"


Expand Down Expand Up @@ -471,6 +471,9 @@ enum ReadyToRunHelper
READYTORUN_HELPER_AllocContinuation = 0x113,
READYTORUN_HELPER_AllocContinuationClass = 0x114,
READYTORUN_HELPER_AllocContinuationMethod = 0x115,

READYTORUN_HELPER_InitClass = 0x116,
READYTORUN_HELPER_InitInstClass = 0x117,
};

#include "readytoruninstructionset.h"
Expand Down
3 changes: 3 additions & 0 deletions src/coreclr/inc/readytorunhelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,8 @@ HELPER(READYTORUN_HELPER_AllocContinuation, CORINFO_HELP_ALLOC_CONTINUAT
HELPER(READYTORUN_HELPER_AllocContinuationClass, CORINFO_HELP_ALLOC_CONTINUATION_CLASS, )
HELPER(READYTORUN_HELPER_AllocContinuationMethod, CORINFO_HELP_ALLOC_CONTINUATION_METHOD, )

HELPER(READYTORUN_HELPER_InitClass, CORINFO_HELP_INITCLASS, )
HELPER(READYTORUN_HELPER_InitInstClass, CORINFO_HELP_INITINSTCLASS, )

#undef HELPER
#undef OPTIMIZEFORSPEED
3 changes: 3 additions & 0 deletions src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,9 @@ public enum ReadyToRunHelper
AllocContinuationClass = 0x114,
AllocContinuationMethod = 0x115,

InitClass = 0x116,
InitInstClass = 0x117,

// **********************************************************************************************
//
// These are not actually part of the R2R file format. We have them here because it's convenient.
Expand Down
6 changes: 6 additions & 0 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 @@ -1293,7 +1293,13 @@ private ISymbolNode GetHelperFtnUncached(CorInfoHelpFunc ftnNum)
break;

case CorInfoHelpFunc.CORINFO_HELP_INITCLASS:
id = ReadyToRunHelper.InitClass;
break;

case CorInfoHelpFunc.CORINFO_HELP_INITINSTCLASS:
id = ReadyToRunHelper.InitInstClass;
break;

case CorInfoHelpFunc.CORINFO_HELP_GETSYNCFROMCLASSHANDLE:
case CorInfoHelpFunc.CORINFO_HELP_GETCLASSFROMMETHODPARAM:
case CorInfoHelpFunc.CORINFO_HELP_THROW_ARGUMENTEXCEPTION:
Expand Down
7 changes: 7 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunSignature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2037,6 +2037,13 @@ private void ParseHelper(StringBuilder builder)
builder.Append("ALLOC_CONTINUATION_CLASS");
break;

case ReadyToRunHelper.InitClass:
builder.Append("INIT_CLASS");
break;
case ReadyToRunHelper.InitInstClass:
builder.Append("INIT_INST_CLASS");
break;

default:
throw new BadImageFormatException();
}
Expand Down
Loading