summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaoni Stephens <Maoni0@users.noreply.github.com>2017-03-18 21:30:55 -0700
committerJan Kotas <jkotas@microsoft.com>2017-03-18 21:30:55 -0700
commitfc3220f19a8ee8266e0782bf8878790453f790e6 (patch)
tree57b34ac34e4a08cabc18244387a15b8037fe410e
parentf22e55bf30580c4e518aaf1c94c31e79297370c6 (diff)
downloadcoreclr-fc3220f19a8ee8266e0782bf8878790453f790e6.tar.gz
coreclr-fc3220f19a8ee8266e0782bf8878790453f790e6.tar.bz2
coreclr-fc3220f19a8ee8266e0782bf8878790453f790e6.zip
I hoisted the accounting for LOH into allocate_large_objects to avoid missing counting in certain stages during bgc when we go through bgc_loh_alloc_clr instead of adjust_limit_clr (#10284)
-rw-r--r--src/gc/gc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp
index 9551e9fad4..b58f4cc3b2 100644
--- a/src/gc/gc.cpp
+++ b/src/gc/gc.cpp
@@ -30766,6 +30766,7 @@ CObjectHeader* gc_heap::allocate_large_object (size_t jsize, int64_t& alloc_byte
uint8_t* result = acontext.alloc_ptr;
assert ((size_t)(acontext.alloc_limit - acontext.alloc_ptr) == size);
+ alloc_bytes += size;
CObjectHeader* obj = (CObjectHeader*)result;
@@ -30802,7 +30803,6 @@ CObjectHeader* gc_heap::allocate_large_object (size_t jsize, int64_t& alloc_byte
assert (obj != 0);
assert ((size_t)obj == Align ((size_t)obj, align_const));
- alloc_bytes += acontext.alloc_bytes;
return obj;
}