diff options
| author | John Högberg <[email protected]> | 2018-11-02 09:38:40 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-11-02 09:38:40 +0100 |
| commit | f668717abf3a28692b7aa096ad7a776eb8738c7a (patch) | |
| tree | 3ceb3a335f26361011de997e26740b37b1d5657e /erts/emulator/beam/external.c | |
| parent | 69797ce56c590125a664b24e16e4e6691d948883 (diff) | |
| parent | 7999ddad6121db7d1b7fe44b3c6a80a8d7ff70f3 (diff) | |
| download | otp-f668717abf3a28692b7aa096ad7a776eb8738c7a.tar.gz otp-f668717abf3a28692b7aa096ad7a776eb8738c7a.tar.bz2 otp-f668717abf3a28692b7aa096ad7a776eb8738c7a.zip | |
Merge branch 'maint'
* maint:
Optimize operator '--' and yield on large inputs
Inline erts_cmp
Clarify a magical allocation size
Fix trapping in lists:reverse/2
Diffstat (limited to 'erts/emulator/beam/external.c')
| -rw-r--r-- | erts/emulator/beam/external.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c index 621ba108ba..9a66e491f3 100644 --- a/erts/emulator/beam/external.c +++ b/erts/emulator/beam/external.c @@ -1953,7 +1953,8 @@ static Eterm erts_term_to_binary_int(Process* p, Eterm Term, int level, Uint fla #define RETURN_STATE() \ do { \ - hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE+3); \ + static const int TUPLE2_SIZE = 2 + 1; \ + hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE + TUPLE2_SIZE); \ c_term = erts_mk_magic_ref(&hp, &MSO(p), context_b); \ res = TUPLE2(hp, Term, c_term); \ BUMP_ALL_REDS(p); \ |