diff options
author | Sverker Eriksson <sverker@erlang.org> | 2021-04-09 14:08:54 +0200 |
---|---|---|
committer | Sverker Eriksson <sverker@erlang.org> | 2021-04-09 14:08:54 +0200 |
commit | 47f356348ee334192aae9c4035f2a7affb8ebbb7 (patch) | |
tree | 0beb10f665ddadf4b4d91da3d94cb850b01b1735 | |
parent | 02764df0918d842ab2729cea6578d79fbe953d84 (diff) | |
parent | 52811bc8c8e531c1e68df4a7578680f374f341f8 (diff) | |
download | erlang-47f356348ee334192aae9c4035f2a7affb8ebbb7.tar.gz |
Merge branch 'sverker/erts/fix-handle-msg-tracing-assert'
-rw-r--r-- | erts/emulator/beam/erl_proc_sig_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c index 8b8b3fdbe3..df48916e06 100644 --- a/erts/emulator/beam/erl_proc_sig_queue.c +++ b/erts/emulator/beam/erl_proc_sig_queue.c @@ -6270,7 +6270,7 @@ handle_msg_tracing(Process *c_p, ErtsSigRecvTracing *tracing, */ next_sig = &sig->next; sig = *next_sig; - ASSERT(!ERTS_SIG_IS_RECV_MARKER(sig) + ASSERT(!sig || !ERTS_SIG_IS_RECV_MARKER(sig) || !((ErtsRecvMarker *) sig)->in_msgq); } |