aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/beam_emu.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-03-03 19:32:00 +0100
committerBjörn-Egil Dahlberg <[email protected]>2015-03-12 19:15:32 +0100
commitf8dbf0c0ff3bd68d720faca230356d281e4e3e42 (patch)
tree952117ca7a0f2d09a9a2c8b3431a33ebda42328c /erts/emulator/beam/beam_emu.c
parent412c30b4dcdb8388b7472c8abb328f2a2fce92c0 (diff)
downloadotp-f8dbf0c0ff3bd68d720faca230356d281e4e3e42.tar.gz
otp-f8dbf0c0ff3bd68d720faca230356d281e4e3e42.tar.bz2
otp-f8dbf0c0ff3bd68d720faca230356d281e4e3e42.zip
First stab at binary_to_term for hamt
with over estimation of heap size.
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
-rw-r--r--erts/emulator/beam/beam_emu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 15591c3cad..4f57037507 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -6556,6 +6556,7 @@ new_map(Process* p, Eterm* reg, BeamInstr* I)
Eterm *E;
BeamInstr *ptr;
map_t *mp;
+ ErtsHeapFactory factory;
ptr = &Arg(4);
@@ -6575,7 +6576,8 @@ new_map(Process* p, Eterm* reg, BeamInstr* I)
p->htop = mhp;
- return erts_hashmap_from_array(p, thp, n/2);
+ factory.p = p;
+ return erts_hashmap_from_array(&factory, thp, n/2);
}
if (HeapWordsLeft(p) < need) {