Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corert.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2017-09-29 15:04:14 +0300
committerGitHub <noreply@github.com>2017-09-29 15:04:14 +0300
commit48d15c4234a0b74dacb43ecce820adc3b188bad1 (patch)
tree67bfc0c4b24835c10cfb69ae00a1d144fc4290d3
parent1a119b57822d0daf921eee265f701cbe056af306 (diff)
Fix build breaks on ProjectN x86 (#4633)
-rw-r--r--src/Native/gc/gc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Native/gc/gc.cpp b/src/Native/gc/gc.cpp
index 1800d84bc..5618c0b7d 100644
--- a/src/Native/gc/gc.cpp
+++ b/src/Native/gc/gc.cpp
@@ -15780,7 +15780,7 @@ start_no_gc_region_status gc_heap::prepare_for_no_gc_region (uint64_t total_size
num_heaps = n_heaps;
#endif // MULTIPLE_HEAPS
- uint64_t total_allowed_soh_allocation = max_soh_allocated * num_heaps;
+ uint64_t total_allowed_soh_allocation = (uint64_t)max_soh_allocated * num_heaps;
// [LOCALGC TODO]
// In theory, the upper limit here is the physical memory of the machine, not
// SIZE_T_MAX. This is not true today because total_physical_mem can be
@@ -15817,7 +15817,7 @@ start_no_gc_region_status gc_heap::prepare_for_no_gc_region (uint64_t total_size
if (allocation_no_gc_soh != 0)
{
- current_no_gc_region_info.soh_allocation_size = allocation_no_gc_soh;
+ current_no_gc_region_info.soh_allocation_size = (size_t)allocation_no_gc_soh;
size_per_heap = current_no_gc_region_info.soh_allocation_size;
#ifdef MULTIPLE_HEAPS
size_per_heap /= n_heaps;
@@ -15833,7 +15833,7 @@ start_no_gc_region_status gc_heap::prepare_for_no_gc_region (uint64_t total_size
if (allocation_no_gc_loh != 0)
{
- current_no_gc_region_info.loh_allocation_size = allocation_no_gc_loh;
+ current_no_gc_region_info.loh_allocation_size = (size_t)allocation_no_gc_loh;
size_per_heap = current_no_gc_region_info.loh_allocation_size;
#ifdef MULTIPLE_HEAPS
size_per_heap /= n_heaps;