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/erl_bif_binary.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/erl_bif_binary.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_binary.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_bif_binary.c b/erts/emulator/beam/erl_bif_binary.c index 3bf78adce7..85bc2daf5d 100644 --- a/erts/emulator/beam/erl_bif_binary.c +++ b/erts/emulator/beam/erl_bif_binary.c @@ -2424,8 +2424,6 @@ static BIF_RETTYPE do_binary_copy(Process *p, Eterm bin, Eterm en) } cbs->result = erts_bin_nrml_alloc(target_size); /* Always offheap if trapping */ - cbs->result->flags = 0; - cbs->result->orig_size = target_size; erts_refc_init(&(cbs->result->refc), 1); t = (byte *) cbs->result->orig_bytes; /* No offset or anything */ pos = 0; |