Skip to content
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

Jump to bottom

Fix fix_allocation_context for regions #54931

Merged
merged 4 commits into from
Jul 2, 2021
Merged

Fix fix_allocation_context for regions #54931

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9db1a10
Fix fix_allocation_context for regions
cshung Jun 29, 2021
601f01d
Code review feedback
cshung Jun 30, 2021
fec0d05
More code review feedback
cshung Jul 1, 2021
7f20a41
Make sure we turn unused space into a free object even when it is at …
cshung Jul 1, 2021
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
48 changes: 29 additions & 19 deletions src/coreclr/gc/gc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7109,6 +7109,8 @@ void gc_heap::fix_youngest_allocation_area()
assert (generation_allocation_pointer (youngest_generation) == nullptr);
assert (generation_allocation_limit (youngest_generation) == nullptr);
heap_segment_allocated (ephemeral_heap_segment) = alloc_allocated;
assert (heap_segment_mem (ephemeral_heap_segment) <= heap_segment_allocated (ephemeral_heap_segment));
assert (heap_segment_allocated (ephemeral_heap_segment) <= heap_segment_reserved (ephemeral_heap_segment));
}

//for_gc_p indicates that the work is being done for GC,
Expand All @@ -7120,35 +7122,41 @@ void gc_heap::fix_allocation_context (alloc_context* acontext, BOOL for_gc_p,
(size_t)acontext,
(size_t)acontext->alloc_ptr, (size_t)acontext->alloc_limit));

if (acontext->alloc_ptr == 0)
{
return;
}
int align_const = get_alignment_constant (TRUE);

if (((size_t)(alloc_allocated - acontext->alloc_limit) > Align (min_obj_size, align_const)) ||
#ifdef USE_REGIONS
bool is_ephemeral_heap_segment = in_range_for_segment (acontext->alloc_limit, ephemeral_heap_segment);
#else // USE_REGIONS
bool is_ephemeral_heap_segment = true;
cshung marked this conversation as resolved.
Show resolved Hide resolved
#endif // USE_REGIONS
if ((!is_ephemeral_heap_segment) || ((size_t)(alloc_allocated - acontext->alloc_limit) > Align (min_obj_size, align_const)) ||
!for_gc_p)
{
uint8_t* point = acontext->alloc_ptr;
if (point != 0)
{
size_t size = (acontext->alloc_limit - acontext->alloc_ptr);
// the allocation area was from the free list
// it was shortened by Align (min_obj_size) to make room for
// at least the shortest unused object
size += Align (min_obj_size, align_const);
assert ((size >= Align (min_obj_size)));
size_t size = (acontext->alloc_limit - acontext->alloc_ptr);
// the allocation area was from the free list
// it was shortened by Align (min_obj_size) to make room for
// at least the shortest unused object
size += Align (min_obj_size, align_const);
assert ((size >= Align (min_obj_size)));

dprintf(3,("Making unused area [%Ix, %Ix[", (size_t)point,
(size_t)point + size ));
make_unused_array (point, size);
dprintf(3,("Making unused area [%Ix, %Ix[", (size_t)point,
(size_t)point + size ));
make_unused_array (point, size);

if (for_gc_p)
{
generation_free_obj_space (generation_of (0)) += size;
if (record_ac_p)
alloc_contexts_used ++;
}
if (for_gc_p)
{
generation_free_obj_space (generation_of (0)) += size;
if (record_ac_p)
alloc_contexts_used ++;
}
}
else if (for_gc_p)
{
assert (is_ephemeral_heap_segment);
alloc_allocated = acontext->alloc_ptr;
assert (heap_segment_allocated (ephemeral_heap_segment) <=
heap_segment_committed (ephemeral_heap_segment));
Expand Down Expand Up @@ -14183,6 +14191,8 @@ void gc_heap::adjust_limit_clr (uint8_t* start, size_t limit_size, size_t size,
if (heap_segment_used (seg) < (alloc_allocated - plug_skew))
{
heap_segment_used (seg) = alloc_allocated - plug_skew;
assert (heap_segment_mem (seg) <= heap_segment_used (seg));
assert (heap_segment_used (seg) <= heap_segment_reserved (seg));
}
}
#ifdef BACKGROUND_GC
Expand Down