diff options
| author | Erlang/OTP <otp@erlang.org> | 2021-05-05 13:45:55 +0200 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2021-05-05 13:45:55 +0200 |
| commit | d690f087968fb5fffe362c6da267c9cfd3270fb1 (patch) | |
| tree | d69c8b53547728b193b96f6bae1b61b2763456df | |
| parent | 40ef098cca8793a4b958ab4e441482ec2ac12d5c (diff) | |
| parent | 916f5978337df4f269593addc3fb69c1f114e21a (diff) | |
| download | erlang-d690f087968fb5fffe362c6da267c9cfd3270fb1.tar.gz | |
Merge branch 'rickard/off-heap-msgq-fix/OTP-17349' into maint-21
* rickard/off-heap-msgq-fix/OTP-17349:
Fix change of message_queue_data to off_heap
| -rw-r--r-- | erts/emulator/beam/erl_message.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c index a3274d7443..86a2067883 100644 --- a/erts/emulator/beam/erl_message.c +++ b/erts/emulator/beam/erl_message.c @@ -895,11 +895,13 @@ erts_move_messages_off_heap(Process *c_p) if (mp->data.attached) continue; + ASSERT(is_immed(ERL_MESSAGE_FROM(mp))); + if (is_immed(ERL_MESSAGE_TERM(mp)) #ifdef USE_VM_PROBES && is_immed(ERL_MESSAGE_DT_UTAG(mp)) #endif - && is_not_immed(ERL_MESSAGE_TOKEN(mp))) + && is_immed(ERL_MESSAGE_TOKEN(mp))) continue; /* |