diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-14 16:51:54 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-14 16:51:54 +0200 |
| commit | 6b588ecd5f62c6867ca1aea17c42f90159859fa9 (patch) | |
| tree | 461aea2cab8675b8dd69d414955e52aa2697d349 /erts | |
| parent | 61f5c0f286ba640e7c9c11614ea5f427a0a90b05 (diff) | |
| parent | e22f99f0303bb5e70b128118bad320ee9368e4ba (diff) | |
| download | otp-6b588ecd5f62c6867ca1aea17c42f90159859fa9.tar.gz otp-6b588ecd5f62c6867ca1aea17c42f90159859fa9.tar.bz2 otp-6b588ecd5f62c6867ca1aea17c42f90159859fa9.zip | |
Merge branch 'sverker/fix-alloc-asserts'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index 2995f2f822..dd8ca5fac1 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -1361,6 +1361,7 @@ fix_cpool_alloc(Allctr_t *allctr, ErtsAlcType_t type, Uint size) && type <= ERTS_ALC_N_MAX_A_FIXED_SIZE); fix = &allctr->fix[type - ERTS_ALC_N_MIN_A_FIXED_SIZE]; + ASSERT(size == fix->type_size); res = fix->list; if (res) { @@ -1372,8 +1373,6 @@ fix_cpool_alloc(Allctr_t *allctr, ErtsAlcType_t type, Uint size) fix_cpool_check_shrink(allctr, type, fix, NULL); return res; } - if (size < 2*sizeof(UWord)) - size += sizeof(UWord); if (size >= allctr->sbc_threshold) { Block_t *blk; blk = create_carrier(allctr, size, CFLG_SBC); @@ -1493,6 +1492,7 @@ fix_nocpool_alloc(Allctr_t *allctr, ErtsAlcType_t type, Uint size) && type <= ERTS_ALC_N_MAX_A_FIXED_SIZE); fix = &allctr->fix[type - ERTS_ALC_N_MIN_A_FIXED_SIZE]; + ASSERT(size == fix->type_size); ERTS_DBG_CHK_FIX_LIST(allctr, fix, ix, 1); fix->u.nocpool.used++; @@ -1515,8 +1515,6 @@ fix_nocpool_alloc(Allctr_t *allctr, ErtsAlcType_t type, Uint size) ERTS_DBG_CHK_FIX_LIST(allctr, fix, ix, 0); return res; } - if (size < 2*sizeof(UWord)) - size += sizeof(UWord); if (fix->u.nocpool.limit < fix->u.nocpool.used) fix->u.nocpool.limit = fix->u.nocpool.used; if (fix->u.nocpool.max_used < fix->u.nocpool.used) |