diff options
| author | Erlang/OTP <[email protected]> | 2019-03-29 19:25:46 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-03-29 19:25:46 +0100 |
| commit | 78b55ab42e037d6c260ff9eb4aa12ddca4816919 (patch) | |
| tree | 9ac6b680bb90effe8f9c3279f697559b559cc46f /erts/emulator/beam/msg_instrs.tab | |
| parent | 370f7dcdaea7f2d506fb427f2dad02d627431727 (diff) | |
| parent | 2c8e6848d3b1d13529e83d8cf76e0a2a458fea52 (diff) | |
| download | otp-78b55ab42e037d6c260ff9eb4aa12ddca4816919.tar.gz otp-78b55ab42e037d6c260ff9eb4aa12ddca4816919.tar.bz2 otp-78b55ab42e037d6c260ff9eb4aa12ddca4816919.zip | |
Merge branch 'sverker/process_info-reductions-fix/OTP-15709' into maint-21
* sverker/process_info-reductions-fix/OTP-15709:
erts: Fix bug in process_info(reductions)
erts: Use ptr_val for pointer in gc msg copy
Diffstat (limited to 'erts/emulator/beam/msg_instrs.tab')
| -rw-r--r-- | erts/emulator/beam/msg_instrs.tab | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/msg_instrs.tab b/erts/emulator/beam/msg_instrs.tab index 9bf3aefaca..a6a0dec451 100644 --- a/erts/emulator/beam/msg_instrs.tab +++ b/erts/emulator/beam/msg_instrs.tab @@ -105,6 +105,7 @@ i_loop_rec(Dest) { $SET_CP_I_ABS(I); c_p->arity = 0; c_p->current = NULL; + c_p->fcalls = FCALLS; FCALLS -= erts_proc_sig_receive_helper(c_p, FCALLS, neg_o_reds, &msgp, &get_out); SWAPIN; |