summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--erts/emulator/beam/erl_bif_info.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 41c0fb82fa..c58b9a53a1 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -1434,10 +1434,15 @@ process_info_aux(Process *c_p,
break;
case ERTS_PI_IX_STATUS: {
- erts_aint32_t state = erts_atomic32_read_nob(&rp->state);
+ erts_aint32_t state;
+ if (!rp_locks)
+ state = erts_atomic32_read_mb(&rp->state);
+ else
+ state = erts_atomic32_read_nob(&rp->state);
res = erts_process_state2status(state);
- if (res == am_running && (state & ERTS_PSFLG_RUNNING_SYS)) {
- ASSERT(c_p == rp);
+ if (res == am_running
+ && c_p == rp
+ && (state & ERTS_PSFLG_RUNNING_SYS)) {
ASSERT(flags & ERTS_PI_FLAG_REQUEST_FOR_OTHER);
if (!(state & (ERTS_PSFLG_SYS_TASKS
| ERTS_PSFLG_ACTIVE