aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_db_hash.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-06-15 15:36:02 +0200
committerSverker Eriksson <[email protected]>2015-06-15 15:36:02 +0200
commit0476714af7f673de941225ed0daee1447935f248 (patch)
treeaf91592c0a3d4cc9933e034db26ed8232ce9827e /erts/emulator/beam/erl_db_hash.c
parentd9cf4788018c511e844320b437e8baf4ef7380ce (diff)
parentf5138184479bd16c0ee0a5e583479378451401c8 (diff)
downloadotp-0476714af7f673de941225ed0daee1447935f248.tar.gz
otp-0476714af7f673de941225ed0daee1447935f248.tar.bz2
otp-0476714af7f673de941225ed0daee1447935f248.zip
Merge branch 'hamt_bin2term'
* hamt_bin2term: erts: Add erts_factory_trim_and_close erts: Optimize driver_deliver_term erts: Remove hashmap probabilistic heap overestimation Conflicts: erts/emulator/beam/beam_load.c
Diffstat (limited to 'erts/emulator/beam/erl_db_hash.c')
-rw-r--r--erts/emulator/beam/erl_db_hash.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c
index 383ee7c430..6e50e9c5b4 100644
--- a/erts/emulator/beam/erl_db_hash.c
+++ b/erts/emulator/beam/erl_db_hash.c
@@ -1049,7 +1049,6 @@ static int db_get_element_hash(Process *p, DbTable *tbl,
Eterm copy = db_copy_element_from_ets(&tb->common, p,
&b->dbterm, ndex, &hp, 2);
elem_list = CONS(hp, copy, elem_list);
- hp += 2;
}
b = b->next;
}