Skip to content

Add static fields for generic types #3218

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 5 commits into from
Oct 9, 2025
Merged

Add static fields for generic types #3218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9fc013
Add static fields for generic types
josesimoes Oct 8, 2025
6b1ab9c
Static fields in closed generic types now simply initialized the ref
josesimoes Oct 8, 2025
6b81038
AssemblyMark in GC now marks generic static fields
josesimoes Oct 8, 2025
c32964c
Improve code per coderabbitai review
josesimoes Oct 8, 2025
4a8f5c4
Storage of static fields for generic types is now global
josesimoes Oct 9, 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
11 changes: 11 additions & 0 deletions src/CLR/Core/GarbageCollector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,17 @@ void CLR_RT_GarbageCollector::Assembly_Mark()

#if !defined(NANOCLR_APPDOMAINS)
CheckMultipleBlocks(pASSM->staticFields, pASSM->staticFieldsCount);

// Mark generic static fields for each TypeSpec
for (int i = 0; i < pASSM->tablesSize[TBL_TypeSpec]; i++)
{
CLR_RT_TypeSpec_CrossReference &ts = pASSM->crossReferenceTypeSpec[i];

if (ts.genericStaticFields != nullptr && ts.genericStaticFieldsCount > 0)
{
CheckMultipleBlocks(ts.genericStaticFields, ts.genericStaticFieldsCount);
}
}
#endif

CheckSingleBlock(&pASSM->file);
Expand Down
48 changes: 42 additions & 6 deletions src/CLR/Core/Interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2728,13 +2728,25 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
{
FETCH_ARG_COMPRESSED_FIELDTOKEN(arg, ip);

CLR_RT_FieldDef_Instance field;
CLR_RT_FieldDef_Instance field{};
CLR_RT_HeapBlock *ptr = nullptr;

// resolve field token
if (field.ResolveToken(arg, assm, &stack->m_call) == false)
{
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
}

CLR_RT_HeapBlock *ptr = CLR_RT_ExecutionEngine::AccessStaticField(field);
if (field.genericType && NANOCLR_INDEX_IS_VALID(*field.genericType))
{
// access static field of a generic instance
ptr = field.assembly->GetStaticFieldByFieldDef(field, field.genericType);
}
else
{
// static field of a non-generic class
ptr = CLR_RT_ExecutionEngine::AccessStaticField(field);
}

if (ptr == nullptr)
{
Expand All @@ -2756,13 +2768,25 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
{
FETCH_ARG_COMPRESSED_FIELDTOKEN(arg, ip);

CLR_RT_FieldDef_Instance field;
CLR_RT_FieldDef_Instance field{};
CLR_RT_HeapBlock *ptr = nullptr;

// resolve field token
if (field.ResolveToken(arg, assm, &stack->m_call) == false)
{
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
}

CLR_RT_HeapBlock *ptr = CLR_RT_ExecutionEngine::AccessStaticField(field);
if (field.genericType && NANOCLR_INDEX_IS_VALID(*field.genericType))
{
// access static field of a generic instance
ptr = field.assembly->GetStaticFieldByFieldDef(field, field.genericType);
}
else
{
// static field of a non-generic class
ptr = CLR_RT_ExecutionEngine::AccessStaticField(field);
}

if (ptr == nullptr)
{
Expand All @@ -2783,13 +2807,25 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
{
FETCH_ARG_COMPRESSED_FIELDTOKEN(arg, ip);

CLR_RT_FieldDef_Instance field;
CLR_RT_FieldDef_Instance field{};
CLR_RT_HeapBlock *ptr = nullptr;

// resolve field token
if (field.ResolveToken(arg, assm, &stack->m_call) == false)
{
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
}

CLR_RT_HeapBlock *ptr = CLR_RT_ExecutionEngine::AccessStaticField(field);
if (field.genericType && NANOCLR_INDEX_IS_VALID(*field.genericType))
{
// access static field of a generic instance
ptr = field.assembly->GetStaticFieldByFieldDef(field, field.genericType);
}
else
{
// static field of a non-generic class
ptr = CLR_RT_ExecutionEngine::AccessStaticField(field);
}

if (ptr == nullptr)
{
Expand Down
Loading