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

4 files changed, 23 insertions, 17 deletions

diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 8687aefd78..6f9e507228 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -757,7 +757,7 @@ typedef struct {
 
 static ErtsProcessInfoArgs pi_args[] = {
     {am_registered_name, 0, 0, ERTS_PROC_LOCK_MAIN},
-    {am_current_function, 4, 0, ERTS_PROC_LOCK_MAIN},
+    {am_current_function, 4, ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN},
     {am_initial_call, 4, 0, ERTS_PROC_LOCK_MAIN},
     {am_status, 0, 0, 0},
     {am_messages, 0, ERTS_PI_FLAG_WANT_MSGS|ERTS_PI_FLAG_NEED_MSGQ_LEN|ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN},
@@ -779,15 +779,15 @@ static ErtsProcessInfoArgs pi_args[] = {
     {am_binary, 0, ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN},
     {am_sequential_trace_token, 0, 0, ERTS_PROC_LOCK_MAIN},
     {am_catchlevel, 0, 0, ERTS_PROC_LOCK_MAIN},
-    {am_backtrace, 0, 0, ERTS_PROC_LOCK_MAIN},
+    {am_backtrace, 0, ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN},
     {am_last_calls, 0, 0, ERTS_PROC_LOCK_MAIN},
     {am_total_heap_size, 0, ERTS_PI_FLAG_NEED_MSGQ_LEN|ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN},
     {am_suspending, 0, ERTS_PI_FLAG_FORCE_SIG_SEND, 0},
     {am_min_heap_size, 0, 0, ERTS_PROC_LOCK_MAIN},
     {am_min_bin_vheap_size, 0, 0, ERTS_PROC_LOCK_MAIN},
     {am_max_heap_size, 0, 0, ERTS_PROC_LOCK_MAIN},
-    {am_current_location, 0, 0, ERTS_PROC_LOCK_MAIN},
-    {am_current_stacktrace, 0, 0, ERTS_PROC_LOCK_MAIN},
+    {am_current_location, 0, ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN},
+    {am_current_stacktrace, 0, ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN},
     {am_message_queue_data, 0, 0, ERTS_PROC_LOCK_MAIN},
     {am_garbage_collection_info, ERTS_PROCESS_GC_INFO_MAX_SIZE, 0, ERTS_PROC_LOCK_MAIN},
     {am_magic_ref, 0, ERTS_PI_FLAG_FORCE_SIG_SEND, ERTS_PROC_LOCK_MAIN},
diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c
index a2e6f1d39d..5165cd22a5 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.c
+++ b/erts/emulator/beam/erl_proc_sig_queue.c
@@ -2558,18 +2558,6 @@ handle_process_info(Process *c_p, ErtsSigRecvTracing *tracing,
                 *c_p->sig_qs.last = NULL;
             }
 
-            if (!pisig->common.specific.next) {
-                /*
-                 * No more signals in middle queue...
-                 *
-                 * Process-info 'status' needs sig-q
-                 * process flag to be updated in order
-                 * to show accurate result...
-                 */
-                erts_atomic32_read_band_nob(&c_p->state,
-                                            ~ERTS_PSFLG_SIG_Q);
-            }
-
 #ifdef ERTS_PROC_SIG_HARD_DEBUG_SIGQ_MSG_LEN
             {
                 Sint len;
@@ -2583,8 +2571,20 @@ handle_process_info(Process *c_p, ErtsSigRecvTracing *tracing,
 #endif
         }
     }
-    if (is_alive)
+    if (is_alive) {
+        if (!pisig->common.specific.next) {
+            /*
+             * No more signals in middle queue...
+             *
+             * Process-info 'status' needs sig-q
+             * process flag to be updated in order
+             * to show accurate result...
+             */
+            erts_atomic32_read_band_nob(&c_p->state,
+                                        ~ERTS_PSFLG_SIG_Q);
+        }
         remove_nm_sig(c_p, sig, next_nm_sig);
+    }
 
     rp = erts_proc_lookup(pisig->requester);
     ASSERT(c_p != rp);
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;
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... */