diff options
| author | Björn Gustavsson <[email protected]> | 2011-11-17 15:59:08 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-11-17 15:59:08 +0100 |
| commit | 80775f1e41a38a617f779bc14736d8b281c12839 (patch) | |
| tree | 7d666a9716795b860d8f810527b5c0ae31f12689 /erts/emulator/beam/erl_message.c | |
| parent | 067cfe79da2490d49288a50db73ad2a884411934 (diff) | |
| parent | 4b5b0e804255bfa537200617ddbc6104d4fd7c75 (diff) | |
| download | otp-80775f1e41a38a617f779bc14736d8b281c12839.tar.gz otp-80775f1e41a38a617f779bc14736d8b281c12839.tar.bz2 otp-80775f1e41a38a617f779bc14736d8b281c12839.zip | |
Merge branch 'bjorn/erts/refc-binary-literals/OTP-9486'
* bjorn/erts/refc-binary-literals/OTP-9486:
external.c: Remove the option to create over-sized heap binaries
Allow refc binaries in literal pools
code_SUITE clean-up: Remove experimental 'constant_pool' option
Diffstat (limited to 'erts/emulator/beam/erl_message.c')
| -rw-r--r-- | erts/emulator/beam/erl_message.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c index 82f272d28a..16be47d540 100644 --- a/erts/emulator/beam/erl_message.c +++ b/erts/emulator/beam/erl_message.c @@ -240,7 +240,7 @@ erts_msg_distext2heap(Process *pp, Sint sz; *bpp = NULL; - sz = erts_decode_dist_ext_size(dist_extp, 0); + sz = erts_decode_dist_ext_size(dist_extp); if (sz < 0) goto decode_error; if (is_not_nil(*tokenp)) { @@ -713,7 +713,7 @@ erts_msg_attached_data_size_aux(ErlMessage *msg) ASSERT(msg->data.dist_ext); ASSERT(msg->data.dist_ext->heap_size < 0); - sz = erts_decode_dist_ext_size(msg->data.dist_ext, 0); + sz = erts_decode_dist_ext_size(msg->data.dist_ext); if (sz < 0) { /* Bad external; remove it */ if (is_not_nil(ERL_MESSAGE_TOKEN(msg))) { |