summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRickard Green <rickard@erlang.org>2020-06-13 13:54:40 +0200
committerRickard Green <rickard@erlang.org>2020-06-13 13:54:40 +0200
commit569ece500288c1b1526592d14346ff6ddbe1c2b7 (patch)
tree1432412dbd054af80e3ee8441a972027320912f2
parentda87db7519e826d64e236fb1f201cf15d63ce07f (diff)
parentd67fa13604349376948d9fa642e036e67ad8af78 (diff)
downloaderlang-569ece500288c1b1526592d14346ff6ddbe1c2b7.tar.gz
Merge branch 'rickard/faulty-port-assert-fix/OTP-16717' into maint
* rickard/faulty-port-assert-fix/OTP-16717: Change faulty assert checking that port is not dead at reschedule
-rw-r--r--erts/emulator/beam/erl_port_task.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 0c55e9bae2..3b56e5b574 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -1873,7 +1873,8 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
if (active) {
ErtsRunQueue *xrunq;
- ASSERT(!(erts_atomic32_read_nob(&pp->state) & ERTS_PORT_SFLGS_DEAD));
+ ASSERT(!(erts_atomic32_read_nob(&pp->state)
+ & ERTS_PORT_SFLG_INITIALIZING));
xrunq = erts_check_emigration_need(runq, ERTS_PORT_PRIO_LEVEL);
ERTS_LC_ASSERT(runq != xrunq);