aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/hipe/hipe_native_bif.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-04-27 15:09:31 +0200
committerRickard Green <[email protected]>2018-04-27 15:09:31 +0200
commit53ef019f6b9c9ab29fdfb25aeb2874af7dcb6e16 (patch)
tree81b08375cfac119fa66c34248f8a39d4d2bd7608 /erts/emulator/hipe/hipe_native_bif.c
parent3669d6cf82f392cf66d6bcf880259edd8edf7be1 (diff)
parent5d2d5678b06770275ce20e333166e4269150f138 (diff)
downloadotp-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/hipe/hipe_native_bif.c')
-rw-r--r--erts/emulator/hipe/hipe_native_bif.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/hipe/hipe_native_bif.c b/erts/emulator/hipe/hipe_native_bif.c
index cf8c4139be..24078af046 100644
--- a/erts/emulator/hipe/hipe_native_bif.c
+++ b/erts/emulator/hipe/hipe_native_bif.c
@@ -546,6 +546,9 @@ Eterm hipe_check_get_msg(Process *c_p)
if (!msgp) {
int get_out;
+ c_p->i = NULL;
+ c_p->arity = 0;
+ c_p->current = NULL;
(void) erts_proc_sig_receive_helper(c_p, CONTEXT_REDS, 0,
&msgp, &get_out);
/* FIXME: Need to bump reductions... */