Skip to content

Allocate static boxes on FOH #2 #79188

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
EgorBo merged 14 commits into from
Dec 6, 2022
Merged

Allocate static boxes on FOH #2 #79188

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c6b9ab9
Allocate static boxes on FOH
EgorBo Dec 3, 2022
4359ee2
Fix "Can't take level 12 lock CrstAssemblyLoader because you already …
EgorBo Dec 3, 2022
a6550c2
Call EnsureInstanceActive before we enter the lock
EgorBo Dec 3, 2022
ef294a9
Test
EgorBo Dec 3, 2022
c132bd7
Update jitinterface.cpp
EgorBo Dec 3, 2022
134a198
Update methodtable.cpp
EgorBo Dec 4, 2022
a58c053
Test
EgorBo Dec 4, 2022
5b59887
Clean up
EgorBo Dec 4, 2022
f7b8487
Merge branch 'main' of github.com:dotnet/runtime into static-boxes
EgorBo Dec 4, 2022
2443b8d
Address feedback
EgorBo Dec 5, 2022
9c5a7fa
Merge branch 'main' of github.com:dotnet/runtime into static-boxes
EgorBo Dec 5, 2022
c779d3a
Address feedback
EgorBo Dec 5, 2022
6047f3a
Apply suggestions from code review
EgorBo Dec 5, 2022
8aabaad
Address feedback
EgorBo Dec 5, 2022
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
Prev Previous commit
Next Next commit
Test
  • Loading branch information
@EgorBo
EgorBo committed Dec 3, 2022
commit ef294a94dd600423476b98a30194918a4d15c39d
2 changes: 1 addition & 1 deletion src/coreclr/inc/CrstTypes.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,5 +579,5 @@ Crst PgoData
End

Crst StaticBoxInit
AcquiredBefore LoaderHeap FrozenObjectHeap
AcquiredBefore LoaderHeap FrozenObjectHeap AssemblyLoader
End
2 changes: 1 addition & 1 deletion src/coreclr/inc/crsttypes_generated.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ int g_rgCrstLevelMap[] =
5, // CrstSingleUseLock
0, // CrstSpecialStatics
0, // CrstStackSampler
4, // CrstStaticBoxInit
13, // CrstStaticBoxInit
-1, // CrstStressLog
5, // CrstStubCache
0, // CrstStubDispatchCache
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/vm/methodtable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3527,7 +3527,6 @@ void MethodTable::AllocateRegularStaticBox(FieldDesc* pField, BYTE* fieldAddress
// Grab field's type handle before we enter lock
MethodTable* pFieldMT = pField->GetFieldTypeHandleThrowing().GetMethodTable();
bool hasFixedAddr = HasFixedAddressVTStatics();
pFieldMT->EnsureInstanceActive();

// Taking a lock since we might come here from multiple threads/places
CrstHolder crst(GetAppDomain()->GetStaticBoxInitLock());
Expand Down