Skip to content

Backport of upstream 100509 #263

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
alexey-zakharov merged 2 commits into from
Apr 2, 2024
Merged

Backport of upstream 100509 #263

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abb2b03
Revert "Fixed SzArray from Collectible LoaderAllocator being allocate…
alexey-zakharov Apr 2, 2024
62e262d
Fix allocation of empty array in the frozen heap for collectible type…
xoofx Apr 2, 2024
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
Next Next commit
Revert "Fixed SzArray from Collectible LoaderAllocator being allocate… 
…d in frozen heap"

This reverts commit 9c7cc33.
  • Loading branch information
@alexey-zakharov
alexey-zakharov committed Apr 2, 2024
commit abb2b03f36681234340b8797a6d153102198a066
1 change: 0 additions & 1 deletion src/coreclr/vm/frozenobjectheap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ Object* FrozenObjectHeapManager::TryAllocateObject(PTR_MethodTable type, size_t
CrstHolder ch(&m_Crst);

_ASSERT(type != nullptr);
_ASSERT(!type->Collectible());
_ASSERT(FOH_COMMIT_SIZE >= MIN_OBJECT_SIZE);

// Currently we don't support frozen objects with special alignment requirements
Expand Down
6 changes: 2 additions & 4 deletions src/coreclr/vm/gchelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,11 +510,9 @@ OBJECTREF TryAllocateFrozenSzArray(MethodTable* pArrayMT, INT32 cElements)

CorElementType elemType = pArrayMT->GetArrayElementType();

if (pArrayMT->Collectible() || (pArrayMT->ContainsPointers() && cElements > 0))
if (pArrayMT->ContainsPointers() && cElements > 0)
{
// We cannot allocate in the frozen heap if:
// - the array type is collectible
// - or for non empty arrays with GC pointers
// For arrays with GC pointers we can only work with empty arrays
return NULL;
}

Expand Down