Skip to content

Fix allocation of empty array in the frozen heap for collectible types #100444

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

Fix allocation of empty array in the frozen heap for collectible types #100444

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9721b40
Fix allocation of empty array in the frozen heap for collectible type…
xoofx Mar 29, 2024
cd1ebe0
Remove Optimize from csproj
xoofx Mar 30, 2024
65474a5
Fix tests
xoofx Mar 30, 2024
97d9d76
Add test for generic with static
xoofx Mar 30, 2024
c492da0
Update src/coreclr/vm/gchelpers.cpp
jkotas Mar 31, 2024
7434c15
Apply suggestions from code review
jkotas Mar 31, 2024
94deb3f
Update src/coreclr/vm/gchelpers.cpp
jkotas Mar 31, 2024
e82d780
Better test
jkotas Mar 31, 2024
2b4009b
Disable test on Mono
jkotas Mar 31, 2024
051bd87
Fix test
jkotas Mar 31, 2024
9a2b12a
Update src/tests/issues.targets
jkotas Apr 1, 2024
24c6681
Merge branch 'main' into fix-frozen-empty-array-alloc-for-collectible…
jkotas Apr 1, 2024
65618de
Disable tests on Mono
jkotas Apr 1, 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
Prev Previous commit
Next Next commit
Update src/coreclr/vm/gchelpers.cpp
  • Loading branch information
@jkotas
jkotas authored Mar 31, 2024
commit c492da029d87d62a44736a76b86124397234eb68
2 changes: 1 addition & 1 deletion src/coreclr/vm/gchelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ OBJECTREF TryAllocateFrozenSzArray(MethodTable* pArrayMT, INT32 cElements)

// The initial validation is copied from AllocateSzArray impl

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
Expand Down