diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-07-29 14:46:14 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-07-29 14:46:14 +0200 |
| commit | e7302e71bf2d56e2117237bb6f0df49cefc9aad2 (patch) | |
| tree | ff13db2ac78da7ff3627e0d9684f7057ed64dc39 /erts/emulator/hipe/hipe_x86_gc.h | |
| parent | bdaef83087c861dc6a0323c1e7363e6601b9986d (diff) | |
| parent | 26bb8c8a2abf40e1504dfeac3e74b3582ea1877b (diff) | |
| download | otp-e7302e71bf2d56e2117237bb6f0df49cefc9aad2.tar.gz otp-e7302e71bf2d56e2117237bb6f0df49cefc9aad2.tar.bz2 otp-e7302e71bf2d56e2117237bb6f0df49cefc9aad2.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/hipe/hipe_x86_gc.h')
| -rw-r--r-- | erts/emulator/hipe/hipe_x86_gc.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/erts/emulator/hipe/hipe_x86_gc.h b/erts/emulator/hipe/hipe_x86_gc.h index c22b28c2d5..00fe03d8f9 100644 --- a/erts/emulator/hipe/hipe_x86_gc.h +++ b/erts/emulator/hipe/hipe_x86_gc.h @@ -81,6 +81,23 @@ nstack_walk_init_sdesc(const Process *p, struct nstack_walk_state *state) #endif } +static inline const struct sdesc* +nstack_walk_init_sdesc_ignore_trap(const Process *p, + struct nstack_walk_state *state) +{ +#ifdef SKIP_YOUNGEST_FRAME + unsigned long ra = p->hipe.nsp[0]; + const struct sdesc *sdesc; + if (ra == (unsigned long)nbif_stack_trap_ra) + ra = (unsigned long)p->hipe.ngra; + sdesc = hipe_find_sdesc(ra); + state->sdesc0 = sdesc; + return sdesc; +#else + return nstack_walk_init_sdesc(p, state); +#endif +} + static inline void nstack_walk_update_trap(Process *p, const struct sdesc *sdesc0) { #ifdef SKIP_YOUNGEST_FRAME |