Skip to content

[release/5.0] Fix issue 41311 - Assert failure ephemeral_heap_segment->saved_committed == heap_segment_committed #41669

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
PeterSolMS merged 1 commit into from
Sep 1, 2020
Merged

[release/5.0] Fix issue 41311 - Assert failure ephemeral_heap_segment->saved_committed == heap_segment_committed #41669

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
14 changes: 12 additions & 2 deletions src/coreclr/src/gc/gc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5703,6 +5703,7 @@ void gc_heap::gc_thread_function ()
END_TIMING(suspend_ee_during_log);

proceed_with_gc_p = TRUE;
gradual_decommit_in_progress_p = FALSE;

if (!should_proceed_with_gc())
{
Expand Down Expand Up @@ -11504,6 +11505,15 @@ BOOL gc_heap::grow_heap_segment (heap_segment* seg, uint8_t* high_address, bool*

assert (heap_segment_committed (seg) <= heap_segment_reserved (seg));
assert (high_address <= heap_segment_committed (seg));

#ifdef MULTIPLE_HEAPS
// we should never increase committed beyond decommit target when gradual
// decommit is in progress - if we do, this means commit and decommit are
// going on at the same time.
assert (!gradual_decommit_in_progress_p ||
(seg != ephemeral_heap_segment) ||
(heap_segment_committed (seg) <= heap_segment_decommit_target (seg)));
#endif // MULTIPLE_HEAPS
}

return !!ret;
Expand Down Expand Up @@ -32456,7 +32466,7 @@ void gc_heap::trim_youngest_desired_low_memory()

void gc_heap::decommit_ephemeral_segment_pages()
{
if (settings.concurrent || use_large_pages_p)
if (settings.concurrent || use_large_pages_p || (settings.pause_mode == pause_no_gc))
{
return;
}
Expand Down Expand Up @@ -32495,7 +32505,7 @@ void gc_heap::decommit_ephemeral_segment_pages()
decommit_target += target_decrease * 2 / 3;
}

heap_segment_decommit_target(ephemeral_heap_segment) = decommit_target;
heap_segment_decommit_target (ephemeral_heap_segment) = decommit_target;

#ifdef MULTIPLE_HEAPS
if (decommit_target < heap_segment_committed (ephemeral_heap_segment))
Expand Down