From d3999cc5b00efc1c2cbeec1782054a4e89851cce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Nov 2022 15:14:03 -0800 Subject: [PATCH] Fix commit accounting for large pages (#78564) Co-authored-by: Andrew Au --- src/coreclr/gc/gc.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/coreclr/gc/gc.cpp b/src/coreclr/gc/gc.cpp index da45255030bbe..7b0271f28d1ce 100644 --- a/src/coreclr/gc/gc.cpp +++ b/src/coreclr/gc/gc.cpp @@ -11730,7 +11730,7 @@ void gc_heap::clear_gen1_cards() heap_segment* gc_heap::make_heap_segment (uint8_t* new_pages, size_t size, gc_heap* hp, int gen_num) { gc_oh_num oh = gen_to_oh (gen_num); - size_t initial_commit = SEGMENT_INITIAL_COMMIT; + size_t initial_commit = use_large_pages_p ? size : SEGMENT_INITIAL_COMMIT; int h_number = #ifdef MULTIPLE_HEAPS hp->heap_number; @@ -11755,8 +11755,7 @@ heap_segment* gc_heap::make_heap_segment (uint8_t* new_pages, size_t size, gc_he heap_segment_mem (new_segment) = start; heap_segment_used (new_segment) = start; heap_segment_reserved (new_segment) = new_pages + size; - heap_segment_committed (new_segment) = (use_large_pages_p ? - heap_segment_reserved(new_segment) : (new_pages + initial_commit)); + heap_segment_committed (new_segment) = new_pages + initial_commit; init_heap_segment (new_segment, hp #ifdef USE_REGIONS