Merge branch 'egil/maps-refactor'

* egil/maps-refactor:
  erts: Use make_small for size terms on flat maps

Conflicts:
	erts/emulator/beam/erl_bif_guard.c

2 files changed, 16 insertions, 23 deletions

diff --git a/erts/emulator/beam/erl_bif_guard.c b/erts/emulator/beam/erl_bif_guard.c
index 069327ee9d..6226ec2d04 100644
--- a/erts/emulator/beam/erl_bif_guard.c
+++ b/erts/emulator/beam/erl_bif_guard.c
@@ -459,26 +459,25 @@ 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 {
-	p->fvalue = arg;
-	BIF_ERROR(p, BADMAP);
-    }
-    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 (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);
+    }
+    p->fvalue = arg;
+    BIF_ERROR(p, BADMAP);
 }
 
 Eterm erts_gc_abs_1(Process* p, Eterm* reg, Uint live)
diff --git a/erts/emulator/beam/erl_map.c b/erts/emulator/beam/erl_map.c
index 3aebbfdaa3..bb2a2bcdf9 100644
--- a/erts/emulator/beam/erl_map.c
+++ b/erts/emulator/beam/erl_map.c
@@ -102,14 +102,8 @@ static int hxnodecmpkey(hxnode_t* a, hxnode_t* b);
 
 BIF_RETTYPE map_size_1(BIF_ALIST_1) {
     if (is_flatmap(BIF_ARG_1)) {
-	Eterm *hp;
-	Uint hsz  = 0;
 	flatmap_t *mp = (flatmap_t*)flatmap_val(BIF_ARG_1);
-	Uint n    = flatmap_get_size(mp);
-
-	erts_bld_uint(NULL, &hsz, n);
-	hp = HAlloc(BIF_P, hsz);
-	BIF_RET(erts_bld_uint(&hp, NULL, n));
+	BIF_RET(make_small(flatmap_get_size(mp)));
     } else if (is_hashmap(BIF_ARG_1)) {
 	Eterm *head, *hp, res;
 	Uint size, hsz=0;