aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_db_util.c
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-08-06 10:54:57 +0200
committerLukas Larsson <[email protected]>2013-08-08 11:23:11 +0200
commita6a08b084f5abe2ab190387918e8a0f4366d454c (patch)
tree397d49278055ec70929fffe8e56fe87371cbc098 /erts/emulator/beam/erl_db_util.c
parentd9f1c1f1bc658d133b9198e4564e419597793cb4 (diff)
downloadotp-a6a08b084f5abe2ab190387918e8a0f4366d454c.tar.gz
otp-a6a08b084f5abe2ab190387918e8a0f4366d454c.tar.bz2
otp-a6a08b084f5abe2ab190387918e8a0f4366d454c.zip
erts: Do not enable TRACE_SILENT when testing a ms
Diffstat (limited to 'erts/emulator/beam/erl_db_util.c')
-rw-r--r--erts/emulator/beam/erl_db_util.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index 713ac0ba18..ef3749a2c4 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -2319,6 +2319,8 @@ restart:
break;
case matchSilent:
--esp;
+ if (in_flags & ERTS_PAM_IGNORE_TRACE_SILENT)
+ break;
if (*esp == am_true) {
erts_smp_proc_lock(c_p, ERTS_PROC_LOCKS_ALL_MINOR);
ERTS_TRACE_FLAGS(c_p) |= F_TRACE_SILENT;
@@ -4971,7 +4973,8 @@ static Eterm match_spec_test(Process *p, Eterm against, Eterm spec, int trace)
save_cp = p->cp;
p->cp = NULL;
res = erts_match_set_run(p, mps, arr, n,
- ERTS_PAM_COPY_RESULT, &ret_flags);
+ ERTS_PAM_COPY_RESULT|ERTS_PAM_IGNORE_TRACE_SILENT,
+ &ret_flags);
p->cp = save_cp;
} else {
n = 0;