Merge branch 'maint'

* maint:
  Fix faulty recv mark assert

1 files changed, 3 insertions, 4 deletions

diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c
index d64cb39891..7d1bde0019 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.c
+++ b/erts/emulator/beam/erl_proc_sig_queue.c
@@ -3358,11 +3358,10 @@ recv_marker_insert(Process *c_p, ErtsRecvMarker *markp, int setting)
 
         if (!setting && *c_p->sig_qs.save == (ErtsMessage *) &markp->sig) {
             /*
-             * This should most likely never happen (which is why the assert
-             * is here), but if it does, leave the message queue in a valid
-             * state...
+             * This can happen when a recv marker recently entered the message
+             * queue via erts_proc_sig_handle_incoming() through the midddle
+             * signal queue...
              */
-            ASSERT(0);
             markp->pass++;
             c_p->sig_qs.save = c_p->sig_qs.last;
         }