diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-04-14 18:07:05 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-04-14 18:07:05 +0200 |
| commit | 647c66952afa9036c060a7685071bb27e01c2151 (patch) | |
| tree | e2ae74bb2f32564fc746511d61b07134fd634275 /erts/emulator/beam/erl_bif_guard.c | |
| parent | 0fc485a1b487f0b22daf2178e28b2f3edfdc7919 (diff) | |
| download | otp-647c66952afa9036c060a7685071bb27e01c2151.tar.gz otp-647c66952afa9036c060a7685071bb27e01c2151.tar.bz2 otp-647c66952afa9036c060a7685071bb27e01c2151.zip | |
erts: Use make_small for size terms on flat maps
Diffstat (limited to 'erts/emulator/beam/erl_bif_guard.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_guard.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/erts/emulator/beam/erl_bif_guard.c b/erts/emulator/beam/erl_bif_guard.c index e7d84ebda1..a5a0c06ad6 100644 --- a/erts/emulator/beam/erl_bif_guard.c +++ b/erts/emulator/beam/erl_bif_guard.c @@ -459,25 +459,24 @@ Eterm erts_gc_byte_size_1(Process* p, Eterm* reg, Uint live) Eterm erts_gc_map_size_1(Process* p, Eterm* reg, Uint live) { Eterm arg = reg[live]; - Eterm* hp; - Uint size; if (is_flatmap(arg)) { flatmap_t *mp = (flatmap_t*)flatmap_val(arg); - size = flatmap_get_size(mp); + return make_small(flatmap_get_size(mp)); } else if (is_hashmap(arg)) { + Eterm* hp; + Uint size; size = hashmap_size(arg); - } else { - BIF_ERROR(p, BADARG); - } - if (IS_USMALL(0, size)) { - return make_small(size); + if (IS_USMALL(0, size)) { + return make_small(size); + } + if (ERTS_NEED_GC(p, BIG_UINT_HEAP_SIZE)) { + erts_garbage_collect(p, BIG_UINT_HEAP_SIZE, reg, live); + } + hp = p->htop; + p->htop += BIG_UINT_HEAP_SIZE; + return uint_to_big(size, hp); } - if (ERTS_NEED_GC(p, BIG_UINT_HEAP_SIZE)) { - erts_garbage_collect(p, BIG_UINT_HEAP_SIZE, reg, live); - } - hp = p->htop; - p->htop += BIG_UINT_HEAP_SIZE; - return uint_to_big(size, hp); + BIF_ERROR(p, BADARG); } Eterm erts_gc_abs_1(Process* p, Eterm* reg, Uint live) |