diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-04-01 09:45:46 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-04-01 09:45:46 +0200 |
| commit | 9b3dd127ea8070e81e21a0a94414f8e7847211e9 (patch) | |
| tree | 316f50c2bc1bc65f4c3f9a7e98b7abda0fcef5ff /erts/emulator/beam/utils.c | |
| parent | 50b17c6f8038dd12140f92dbc67813b51d580e9d (diff) | |
| parent | 7cf7387cfe0fdc43a8cf3b48d89b4adb313bee9f (diff) | |
| download | otp-9b3dd127ea8070e81e21a0a94414f8e7847211e9.tar.gz otp-9b3dd127ea8070e81e21a0a94414f8e7847211e9.tar.bz2 otp-9b3dd127ea8070e81e21a0a94414f8e7847211e9.zip | |
Merge branch 'egil/fix-maps-tmp-heap'
* egil/fix-maps-tmp-heap:
erts: Test deep Maps updates
erts: Use halfword secure tmp heap
erts: Remove unused tmp heap in make_internal_hash
Conflicts:
erts/emulator/test/map_SUITE.erl
Diffstat (limited to 'erts/emulator/beam/utils.c')
| -rw-r--r-- | erts/emulator/beam/utils.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index 91f4accd30..2dd81e3ca3 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -1614,7 +1614,6 @@ make_internal_hash(Eterm term) Eterm tmp; DECLARE_ESTACK(s); - UseTmpHeapNoproc(2); hash = 0; for (;;) { switch (primary_tag(term)) { @@ -1919,7 +1918,6 @@ make_internal_hash(Eterm term) pop_next: if (ESTACK_ISEMPTY(s)) { DESTROY_ESTACK(s); - UnUseTmpHeapNoproc(2); return hash; } |