diff options
author | Sverker Eriksson <[email protected]> | 2014-09-17 20:49:22 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2014-09-17 20:49:22 +0200 |
commit | 86b7cf42011302a78cb73ec4f339a2b31af8ae9a (patch) | |
tree | ed946bbce166d1c012788522f5508ec01fa006a2 /erts/emulator/beam/beam_emu.c | |
parent | 723fea8f585c3006aa5cbda7d33de44d054eeafa (diff) | |
parent | 933a5f071e0dc7f2051e1ccc58ca4e361db52ef4 (diff) | |
download | otp-86b7cf42011302a78cb73ec4f339a2b31af8ae9a.tar.gz otp-86b7cf42011302a78cb73ec4f339a2b31af8ae9a.tar.bz2 otp-86b7cf42011302a78cb73ec4f339a2b31af8ae9a.zip |
Merge branch 'sverk/bin-alloc-refactor'
* sverk/bin-alloc-refactor:
erts: Fix gdb command etp-carrier-blocks for 32-bit
erts: Refactor binary allocation interface to also initialize Binary
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
-rw-r--r-- | erts/emulator/beam/beam_emu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 1096c2c8c8..52df7b4d2d 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -3782,8 +3782,6 @@ get_map_elements_fail: * Allocate the binary struct itself. */ bptr = erts_bin_nrml_alloc(num_bytes); - bptr->flags = 0; - bptr->orig_size = num_bytes; erts_refc_init(&bptr->refc, 1); erts_current_bin = (byte *) bptr->orig_bytes; @@ -3883,8 +3881,6 @@ get_map_elements_fail: * Allocate the binary struct itself. */ bptr = erts_bin_nrml_alloc(tmp_arg1); - bptr->flags = 0; - bptr->orig_size = tmp_arg1; erts_refc_init(&bptr->refc, 1); erts_current_bin = (byte *) bptr->orig_bytes; |