aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-03-26 11:10:17 +0200
committerRickard Green <[email protected]>2018-03-26 11:10:17 +0200
commit4137ef162e23307d40616f70206dd2195c453576 (patch)
tree198511fe8f89e119b4e40843a2eb7cfadb40cea9
parent854bfa3796d5ab7a104fa7b1f94691811ac6ebfc (diff)
parent2d3437392c000f8d4846a57dd399f1e4e4be8b2f (diff)
downloadotp-4137ef162e23307d40616f70206dd2195c453576.tar.gz
otp-4137ef162e23307d40616f70206dd2195c453576.tar.bz2
otp-4137ef162e23307d40616f70206dd2195c453576.zip
Merge branch 'rickard/signals/OTP-14589'
* rickard/signals/OTP-14589: Fix VM probes compilation
-rw-r--r--erts/emulator/beam/erl_proc_sig_queue.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c
index b4759967a7..99d20e9242 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.c
+++ b/erts/emulator/beam/erl_proc_sig_queue.c
@@ -40,6 +40,7 @@
#include "erl_gc.h"
#include "bif.h"
#include "erl_proc_sig_queue.h"
+#include "dtrace-wrapper.h"
#define ERTS_SIG_REDS_CNT_FACTOR 4
#define ERTS_PROC_SIG_TRACE_COUNT_LIMIT 200
@@ -751,13 +752,14 @@ send_gen_exit_signal(Process *c_p, Eterm from_tag,
seq_trace_update_send(c_p);
#ifdef USE_VM_PROBES
+ utag_sz = 0;
+ utag = NIL;
if (c_p && token != NIL && (DT_UTAG_FLAGS(c_p) & DT_UTAG_SPREADING)) {
utag_sz = size_object(DT_UTAG(c_p));
utag = DT_UTAG(c_p);
}
else if (token == am_have_dt_utag) {
- utag_sz = 0;
- utag = token = NIL;
+ token = NIL;
}
hsz += utag_sz;
#endif