diff options
| author | Rickard Green <[email protected]> | 2018-04-27 15:09:31 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-04-27 15:09:31 +0200 |
| commit | 53ef019f6b9c9ab29fdfb25aeb2874af7dcb6e16 (patch) | |
| tree | 81b08375cfac119fa66c34248f8a39d4d2bd7608 /erts/emulator/beam/msg_instrs.tab | |
| parent | 3669d6cf82f392cf66d6bcf880259edd8edf7be1 (diff) | |
| parent | 5d2d5678b06770275ce20e333166e4269150f138 (diff) | |
| download | otp-53ef019f6b9c9ab29fdfb25aeb2874af7dcb6e16.tar.gz otp-53ef019f6b9c9ab29fdfb25aeb2874af7dcb6e16.tar.bz2 otp-53ef019f6b9c9ab29fdfb25aeb2874af7dcb6e16.zip | |
Merge branch 'rickard/process_info/OTP-14966'
* rickard/process_info/OTP-14966:
Fix scheduled process_info() 'status' request
Fix handling of process-info requests in receive
Diffstat (limited to 'erts/emulator/beam/msg_instrs.tab')
| -rw-r--r-- | erts/emulator/beam/msg_instrs.tab | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/msg_instrs.tab b/erts/emulator/beam/msg_instrs.tab index 26bea0efc6..9bf3aefaca 100644 --- a/erts/emulator/beam/msg_instrs.tab +++ b/erts/emulator/beam/msg_instrs.tab @@ -102,6 +102,9 @@ i_loop_rec(Dest) { if (ERTS_UNLIKELY(msgp == NULL)) { int get_out; SWAPOUT; + $SET_CP_I_ABS(I); + c_p->arity = 0; + c_p->current = NULL; FCALLS -= erts_proc_sig_receive_helper(c_p, FCALLS, neg_o_reds, &msgp, &get_out); SWAPIN; |