diff options
| author | Patrik Nyblom <[email protected]> | 2010-08-30 14:21:49 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-08-30 14:21:49 +0200 |
| commit | be798f416bcab08df788101be486e8f33cd62320 (patch) | |
| tree | 77b699ed254187b5facb6baaf396c05f951c0a24 /erts/emulator/beam/beam_emu.c | |
| parent | 5b91c9f8e79f0e8eb0a5816fd54c5603f1c6df29 (diff) | |
| parent | 7664e3ac07f51522b464e550e6012056d4ab45d5 (diff) | |
| download | otp-be798f416bcab08df788101be486e8f33cd62320.tar.gz otp-be798f416bcab08df788101be486e8f33cd62320.tar.bz2 otp-be798f416bcab08df788101be486e8f33cd62320.zip | |
Merge branch 'egil/R14A/binary-gc-wrap/OTP-8730' into dev
* egil/R14A/binary-gc-wrap/OTP-8730:
Increase vheap counter to Uint64
Fix wrapping in next vheap calculation
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 260f349563..0b29644f24 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -3390,7 +3390,7 @@ apply_bif_or_nif_epilogue: pb->val = bptr; pb->bytes = (byte*) bptr->orig_bytes; pb->flags = 0; - MSO(c_p).overhead += pb->size / sizeof(Eterm); + OH_OVERHEAD(&(MSO(c_p)), pb->size / sizeof(Eterm)); new_binary = make_binary(pb); goto do_bits_sub_bin; } @@ -3492,7 +3492,7 @@ apply_bif_or_nif_epilogue: pb->bytes = (byte*) bptr->orig_bytes; pb->flags = 0; - MSO(c_p).overhead += tmp_arg1 / sizeof(Eterm); + OH_OVERHEAD(&(MSO(c_p)), tmp_arg1 / sizeof(Eterm)); StoreBifResult(2, make_binary(pb)); } |