Skip to content

[release/7.0] Fix max chunk size limiting #81607

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 1 commit into from
Oct 12, 2023
Merged

[release/7.0] Fix max chunk size limiting #81607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion src/coreclr/vm/methodtablebuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6871,9 +6871,15 @@ VOID MethodTableBuilder::AllocAndInitMethodDescs()
SIZE_T sizeOfMethodDescs = 0; // current running size of methodDesc chunk
int startIndex = 0; // start of the current chunk (index into bmtMethod array)

// Limit the maximum MethodDescs per chunk by the number of precodes that can fit to a single memory page,
// since we allocate consecutive temporary entry points for all MethodDescs in the whole chunk.
DWORD maxPrecodesPerPage = Precode::GetMaxTemporaryEntryPointsCount();
DWORD methodDescCount = 0;

DeclaredMethodIterator it(*this);
while (it.Next())
{
DWORD currentSlotMethodDescCount = 1;
int tokenRange = GetTokenRange(it.Token());

// This code assumes that iterator returns tokens in ascending order. If this assumption does not hold,
Expand All @@ -6896,6 +6902,7 @@ VOID MethodTableBuilder::AllocAndInitMethodDescs()
// See comment in AllocAndInitMethodDescChunk
if (NeedsTightlyBoundUnboxingStub(*it))
{
currentSlotMethodDescCount = 2;
size *= 2;

if (bmtGenerics->GetNumGenericArgs() == 0) {
Expand All @@ -6907,7 +6914,8 @@ VOID MethodTableBuilder::AllocAndInitMethodDescs()
}

if (tokenRange != currentTokenRange ||
sizeOfMethodDescs + size > MethodDescChunk::MaxSizeOfMethodDescs)
sizeOfMethodDescs + size > MethodDescChunk::MaxSizeOfMethodDescs ||
methodDescCount + currentSlotMethodDescCount > maxPrecodesPerPage)
{
if (sizeOfMethodDescs != 0)
{
Expand All @@ -6917,9 +6925,11 @@ VOID MethodTableBuilder::AllocAndInitMethodDescs()

currentTokenRange = tokenRange;
sizeOfMethodDescs = 0;
methodDescCount = 0;
}

sizeOfMethodDescs += size;
methodDescCount += currentSlotMethodDescCount;
}

if (sizeOfMethodDescs != 0)
Expand Down