diff options
author | Lukas Larsson <[email protected]> | 2016-07-11 10:12:09 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-07-11 10:12:09 +0200 |
commit | a5256e5221aff30f6d2cc7fab4875914ae734217 (patch) | |
tree | 7c003461db2bf0954f03f2c97399cb553210332d /erts/emulator/beam/erl_nif.c | |
parent | 26a82340090afa7b79db3e0e54f6f8dace290f91 (diff) | |
parent | 3b186417f6641a3aa13a46e00712d7dfcb29fc0f (diff) | |
download | otp-a5256e5221aff30f6d2cc7fab4875914ae734217.tar.gz otp-a5256e5221aff30f6d2cc7fab4875914ae734217.tar.bz2 otp-a5256e5221aff30f6d2cc7fab4875914ae734217.zip |
Merge branch 'lukas/erts/tracing/bif_return_to_trace_fix/OTP-13734' into maint
* lukas/erts/tracing/bif_return_to_trace_fix/OTP-13734:
erts: After a call to a tracer nif, reset htop
erts: Check if return_to trace is enabled for bif
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
-rw-r--r-- | erts/emulator/beam/erl_nif.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index 23931f0e54..c6127a4967 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -3502,6 +3502,7 @@ Eterm erts_nif_call_function(Process *p, Process *tracee, struct enif_environment_t env; ErlHeapFragment *orig_hf = MBUF(p); ErlOffHeap orig_oh = MSO(p); + Eterm *orig_htop = HEAP_TOP(p); ASSERT(is_internal_pid(p->common.id)); MBUF(p) = NULL; clear_offheap(&MSO(p)); @@ -3523,6 +3524,7 @@ Eterm erts_nif_call_function(Process *p, Process *tracee, /* restore original heap fragment list */ MBUF(p) = orig_hf; MSO(p) = orig_oh; + HEAP_TOP(p) = orig_htop; } else { /* Nif call was done without a process context, so we create a phony one. */ |