diff options
| author | Sverker Eriksson <[email protected]> | 2014-01-20 15:01:51 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-01-20 15:02:14 +0100 |
| commit | d7b5e517cf1fa91310072ea6992799c49be70ae8 (patch) | |
| tree | a51b44a15ce3362048ceda5ca62ee115bf8652ed /erts/emulator/beam | |
| parent | 1a3d2435e28d0dcb5e8f5a4bcd82c8b3d2db495b (diff) | |
| parent | 11533683c568402ec11afc9e1823debac74414d7 (diff) | |
| download | otp-d7b5e517cf1fa91310072ea6992799c49be70ae8.tar.gz otp-d7b5e517cf1fa91310072ea6992799c49be70ae8.tar.bz2 otp-d7b5e517cf1fa91310072ea6992799c49be70ae8.zip | |
Merge branch 'sverk/bin2term-int-size-estimation-bug'
OTP-11585
* sverk/bin2term-int-size-estimation-bug:
erts: Fix useless comparisons in binary_SUITE:external_size
erts: Reduce heap usage for binary_SUITE:deep
erts: Remove overestimation of heap space in binary_to_term
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/external.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c index 2cb44a5b64..bccbedc7bd 100644 --- a/erts/emulator/beam/external.c +++ b/erts/emulator/beam/external.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2013. All Rights Reserved. + * Copyright Ericsson AB 1996-2014. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -4074,7 +4074,9 @@ init_done: switch (tag) { case INTEGER_EXT: SKIP(4); +#if !defined(ARCH_64) || HALFWORD_HEAP heap_size += BIG_UINT_HEAP_SIZE; +#endif break; case SMALL_INTEGER_EXT: SKIP(1); |