small fixes, reduced segment size, fix merge conflicts

2020-01-20 22:33:29 -08:00
parent 394a7a92ab
commit 0028272cf4
7 changed files with 45 additions and 41 deletions
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -195,6 +195,7 @@ static mi_decl_noinline void mi_free_huge_block_mt(mi_segment_t* segment, mi_pag
    mi_tld_t* tld = heap->tld;
    const size_t bsize = mi_page_block_size(page);
    if (bsize <= MI_LARGE_OBJ_SIZE_MAX) {
+      mi_assert_internal(false);
      _mi_stat_decrease(&tld->stats.large, bsize);
    }
    else {