diff options
| author | Rickard Green <[email protected]> | 2015-11-13 09:53:17 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-11-13 09:53:17 +0100 |
| commit | c66844d145177fbb65bcc101a9962e5a5673c162 (patch) | |
| tree | 3e4861d09658f94e07048e0ae6c5d1c7ccd670f6 /erts/emulator | |
| parent | 4f815fab536a3ec1839c2590b8f4f169a27fccac (diff) | |
| parent | b56f5a163555181dceb79cbfd0d69d3cb5015e9c (diff) | |
| download | otp-c66844d145177fbb65bcc101a9962e5a5673c162.tar.gz otp-c66844d145177fbb65bcc101a9962e5a5673c162.tar.bz2 otp-c66844d145177fbb65bcc101a9962e5a5673c162.zip | |
Merge branch 'rickard/gc-after-bif-cond/OTP-13098'
* rickard/gc-after-bif-cond/OTP-13098:
Use the same conditions when triggering GC after BIF
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index cd2aee4bbf..162713622b 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -3533,14 +3533,7 @@ do { \ apply_bif_or_nif_epilogue: ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p); ERTS_HOLE_CHECK(c_p); - /* - * We want to test with ERTS_IS_GC_DESIRED(c_p) in order - * to trigger gc due to binaries based on same conditions - * regardless of how the bif is called. This change will - * however be introduced in a separate commit in order to - * easier identify why the characteristics changed. - */ - if (c_p->stop - c_p->htop < c_p->mbuf_sz) { + if (ERTS_IS_GC_DESIRED(c_p)) { nif_bif_result = erts_gc_after_bif_call_lhf(c_p, live_hf_end, nif_bif_result, reg, bif_nif_arity); |