Merge branch 'maint'

* maint:
  erts: Do not enable TRACE_SILENT when testing a ms

3 files changed, 18 insertions, 6 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;
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 2a3a45f717..7f7b6f5d1e 100755
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1024,9 +1024,10 @@ Eterm erts_match_set_lint(Process *p, Eterm matchexpr);
 extern void erts_match_set_release_result(Process* p);
 
 enum erts_pam_run_flags {
-    ERTS_PAM_TMP_RESULT=0,
-    ERTS_PAM_COPY_RESULT=1,
-    ERTS_PAM_CONTIGUOUS_TUPLE=2
+    ERTS_PAM_TMP_RESULT=1,
+    ERTS_PAM_COPY_RESULT=2,
+    ERTS_PAM_CONTIGUOUS_TUPLE=4,
+    ERTS_PAM_IGNORE_TRACE_SILENT=8
 };
 extern Eterm erts_match_set_run(Process *p, Binary *mpsp, 
 				Eterm *args, int num_args,
diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl
index 8dbc6b6538..b56b7ce525 100644
--- a/erts/emulator/test/match_spec_SUITE.erl
+++ b/erts/emulator/test/match_spec_SUITE.erl
@@ -22,7 +22,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, not_run/1]).
 -export([test_1/1, test_2/1, test_3/1, bad_match_spec_bin/1,
-	 trace_control_word/1, silent/1, silent_no_ms/1, 
+	 trace_control_word/1, silent/1, silent_no_ms/1, silent_test/1,
 	 ms_trace2/1, ms_trace3/1, boxed_and_small/1,
 	 destructive_in_test_bif/1, guard_exceptions/1,
 	 unary_plus/1, unary_minus/1, moving_labels/1]).
@@ -55,7 +55,7 @@ all() ->
     case test_server:is_native(match_spec_SUITE) of
 	false ->
 	    [test_1, test_2, test_3, bad_match_spec_bin,
-	     trace_control_word, silent, silent_no_ms, ms_trace2,
+	     trace_control_word, silent, silent_no_ms, silent_test, ms_trace2,
 	     ms_trace3, boxed_and_small, destructive_in_test_bif,
 	     guard_exceptions, unary_plus, unary_minus, fpe,
 	     moving_labels,
@@ -501,6 +501,14 @@ silent_no_ms(Config) when is_list(Config) ->
 			 {trace,Tracee,return_to,{?MODULE,f3,2}}]
 	    end).
 
+silent_test(doc) ->
+    ["Test that match_spec_test does not activate silent"];
+silent_test(_Config) ->
+    {flags,[]} = erlang:trace_info(self(),flags),
+    erlang:match_spec_test([],[{'_',[],[{silent,true}]}],trace),
+    {flags,[]} = erlang:trace_info(self(),flags).
+
+
 ms_trace2(doc) ->
     ["Test the match spec functions {trace/2}"];
 ms_trace2(suite) -> [];