diff options
| author | Rickard Green <[email protected]> | 2017-01-11 16:51:41 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-01-11 16:51:41 +0100 |
| commit | 9d029dd04ad1a6a9e9725952b83d7cbdddfca088 (patch) | |
| tree | 7cc405b8c60d0a3c7a5cc7648da46a69b218a0f9 /erts/emulator/beam/beam_bif_load.c | |
| parent | 4e48180f1e9a59e02a8b4a0276ea89b928910ad9 (diff) | |
| parent | 8df00f51a4a2c0c6788b3dcf3c6be56c50e44461 (diff) | |
| download | otp-9d029dd04ad1a6a9e9725952b83d7cbdddfca088.tar.gz otp-9d029dd04ad1a6a9e9725952b83d7cbdddfca088.tar.bz2 otp-9d029dd04ad1a6a9e9725952b83d7cbdddfca088.zip | |
Merge branch 'rickard/abandoned-heap-bugs' into maint
OTP-14134
OTP-14135
* rickard/abandoned-heap-bugs:
Fix issues with abandoned heap
Diffstat (limited to 'erts/emulator/beam/beam_bif_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_bif_load.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c index 644fd9fbf9..e2a0b8818e 100644 --- a/erts/emulator/beam/beam_bif_load.c +++ b/erts/emulator/beam/beam_bif_load.c @@ -995,6 +995,12 @@ erts_proc_copy_literal_area(Process *c_p, int *redsp, int fcalls, int gc_allowed if (any_heap_refs(c_p->heap, c_p->htop, literals, lit_bsize)) goto literal_gc; *redsp += 1; + if (c_p->abandoned_heap) { + if (any_heap_refs(c_p->abandoned_heap, c_p->abandoned_heap + c_p->heap_sz, + literals, lit_bsize)) + goto literal_gc; + *redsp += 1; + } if (any_heap_refs(c_p->old_heap, c_p->old_htop, literals, lit_bsize)) goto literal_gc; @@ -1295,6 +1301,11 @@ check_process_code(Process* rp, Module* modp, Uint flags, int *redsp, int fcalls #endif if (any_heap_refs(rp->heap, rp->htop, literals, lit_bsize)) goto try_literal_gc; + if (rp->abandoned_heap) { + if (any_heap_refs(rp->abandoned_heap, rp->abandoned_heap + rp->heap_sz, + literals, lit_bsize)) + goto try_literal_gc; + } if (any_heap_refs(rp->old_heap, rp->old_htop, literals, lit_bsize)) goto try_literal_gc; |