From da75310ce8973221ac90fd34f6375bfc17ae751b Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Thu, 31 Mar 2016 21:20:24 +0200
Subject: erts: Change receive matchspec to [NodeOrOther, Pid, Msg]

---
 erts/emulator/beam/erl_trace.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'erts/emulator/beam/erl_trace.c')

diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index 682f08f667..be0d2f0939 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -871,14 +871,23 @@ trace_receive(Process* receiver,
         if (!te->on)
             return;
     }
+    else ASSERT(te->on);
 
     if (te->match_spec) {
-        Eterm args[2];
+        Eterm args[3];
         Uint32 return_flags;
-        args[0] = from;
-        args[1] = msg;
+        if (is_pid(from)) {
+            args[0] = pid_node_name(from);
+            args[1] = from;
+        }
+        else {
+            ASSERT(is_atom(from));
+            args[0] = from;  /* node name or other atom (e.g 'system') */
+            args[1] = am_undefined;
+        }
+        args[2] = msg;
         pam_result = erts_match_set_run(NULL, receiver,
-                                        te->match_spec, args, 2,
+                                        te->match_spec, args, 3,
                                         ERTS_PAM_TMP_RESULT, &return_flags);
         if (is_non_value(pam_result)
             || pam_result == am_false
-- 
cgit v1.2.3