Skip to content

Support for arbitrary self-referential static fields on a type #118413

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 10 commits into from
Aug 15, 2025
Merged

Support for arbitrary self-referential static fields on a type #118413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
af71b82
Support for arbitrary self-referential static fields on a type
davidwrighton Aug 5, 2025
3f1507a
Fix build issue for unix platforms, and touch a mono file so the test…
davidwrighton Aug 6, 2025
a7a77bb
Fix test build
davidwrighton Aug 6, 2025
8c2718e
Fix error found in CI
davidwrighton Aug 6, 2025
3877dc7
Return to behaving much like the existing logic unless the self-refer…
davidwrighton Aug 11, 2025
ff91153
Merge branch 'main' of github.com:dotnet/runtime into SelfReferential…
davidwrighton Aug 11, 2025
d15dd5d
Fix issue found in CI
davidwrighton Aug 12, 2025
f9bf8c6
Merge branch 'main' of github.com:dotnet/runtime into SelfReferential…
davidwrighton Aug 12, 2025
33d1252
Move the code to a better spot
davidwrighton Aug 13, 2025
8e2040d
Fixed comment issues found in code review
davidwrighton Aug 13, 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
16 changes: 16 additions & 0 deletions src/coreclr/vm/class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,6 +1134,22 @@ void ClassLoader::LoadExactParents(MethodTable* pMT)
EnsureLoaded(TypeHandle(pMT->GetCanonicalMethodTable()), CLASS_LOAD_EXACTPARENTS);
}

if (pMT->GetClass()->HasRVAStaticFields())
{
ApproxFieldDescIterator fdIterator(pMT, ApproxFieldDescIterator::STATIC_FIELDS);
FieldDesc* pFD = NULL;
while ((pFD = fdIterator.Next()) != NULL)
{
if (pFD->IsByValue() && pFD->IsRVA())
{
if (pFD->GetApproxFieldTypeHandleThrowing().GetMethodTable()->GetClass()->HasFieldsWhichMustBeInited())
{
ThrowHR(COR_E_BADIMAGEFORMAT);
}
}
}
}

LoadExactParentAndInterfacesTransitively(pMT);

if (pMT->GetClass()->HasVTableMethodImpl())
Expand Down
10 changes: 5 additions & 5 deletions src/coreclr/vm/class.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,15 +1317,15 @@ class EEClass // DO NOT CREATE A NEW EEClass USING NEW!
LIMITED_METHOD_CONTRACT;
m_VMFlags |= (DWORD)VMFLAG_INLINE_ARRAY;
}
DWORD HasNonPublicFields()
DWORD HasRVAStaticFields()
{
LIMITED_METHOD_CONTRACT;
return (m_VMFlags & VMFLAG_HASNONPUBLICFIELDS);
return (m_VMFlags & VMFLAG_HASRVASTATICFIELDS);
}
void SetHasNonPublicFields()
void SetHasRVAStaticFields()
{
LIMITED_METHOD_CONTRACT;
m_VMFlags |= (DWORD)VMFLAG_HASNONPUBLICFIELDS;
m_VMFlags |= (DWORD)VMFLAG_HASRVASTATICFIELDS;
}
DWORD IsNotTightlyPacked()
{
Expand Down Expand Up @@ -1647,7 +1647,7 @@ class EEClass // DO NOT CREATE A NEW EEClass USING NEW!

VMFLAG_INLINE_ARRAY = 0x00010000,
VMFLAG_NO_GUID = 0x00020000,
VMFLAG_HASNONPUBLICFIELDS = 0x00040000,
VMFLAG_HASRVASTATICFIELDS = 0x00040000,
VMFLAG_HAS_CUSTOM_FIELD_ALIGNMENT = 0x00080000,
VMFLAG_CONTAINS_STACK_PTR = 0x00100000,
VMFLAG_PREFER_ALIGN8 = 0x00200000, // Would like to have 8-byte alignment
Expand Down
Loading
Loading