diff options
| author | Magnus Lång <[email protected]> | 2016-05-23 15:41:31 +0200 |
|---|---|---|
| committer | Magnus Lång <[email protected]> | 2016-07-06 16:08:20 +0200 |
| commit | f0131c58c42a286c8b3f611b47106393a37197b6 (patch) | |
| tree | caefc37baef32b065e69f23cc363a83ff70dcd12 /erts/emulator/beam/beam_bif_load.c | |
| parent | 3b409021a70427bb2fe3834707edf822b6afce2d (diff) | |
| download | otp-f0131c58c42a286c8b3f611b47106393a37197b6.tar.gz otp-f0131c58c42a286c8b3f611b47106393a37197b6.tar.bz2 otp-f0131c58c42a286c8b3f611b47106393a37197b6.zip | |
check_process_code: Sweep HiPE stack for literals
Because check_process_code neglected checking the HiPE stack for
references to the literal area, such references would survive the purge
and subsequent deletion of a module and its literal area. These dangling
references would then cause incorrect behaviour or even hard crashes of
the VM.
By simply adding a scan of the HiPE stack to check_process_code and
erts_garbage_collect_literals, this problem is fixed.
In order to support full stack walks without deleting the graylimit
trap, a new stack walking interface function,
nstack_walk_init_sdesc_ignore_trap() was introduced.
Diffstat (limited to 'erts/emulator/beam/beam_bif_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_bif_load.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c index 15e878ba65..92815b2bcd 100644 --- a/erts/emulator/beam/beam_bif_load.c +++ b/erts/emulator/beam/beam_bif_load.c @@ -37,6 +37,10 @@ #include "erl_bits.h" #include "erl_thr_progress.h" +#ifdef HIPE +# include "hipe_stack.h" +#endif + static void set_default_trace_pattern(Eterm module); static Eterm check_process_code(Process* rp, Module* modp, Uint flags, int *redsp, int fcalls); static void delete_code(Module* modp); @@ -916,6 +920,10 @@ check_process_code(Process* rp, Module* modp, Uint flags, int *redsp, int fcalls } if (any_heap_ref_ptrs(rp->stop, rp->hend, literals, lit_bsize)) goto try_literal_gc; +#ifdef HIPE + if (nstack_any_heap_ref_ptrs(rp, literals, lit_bsize)) + goto try_literal_gc; +#endif if (any_heap_refs(rp->heap, rp->htop, literals, lit_bsize)) goto try_literal_gc; if (any_heap_refs(rp->old_heap, rp->old_htop, literals, lit_bsize)) |