Merge branch 'sverk/trace-process_dump-matchstate' into maint

* sverk/trace-process_dump-matchstate:
  erts: Add testcase for tracing whith 'process_dump'
  erts: Fix bug when tracing with 'process_dump'

OTP-12968

6 files changed, 49 insertions, 27 deletions

diff --git a/erts/emulator/beam/erl_debug.c b/erts/emulator/beam/erl_debug.c
index 77a1e3d7cb..2dcfb79f00 100644
--- a/erts/emulator/beam/erl_debug.c
+++ b/erts/emulator/beam/erl_debug.c
@@ -189,6 +189,9 @@ pdisplay1(int to, void *to_arg, Process* p, Eterm obj)
     case BINARY_DEF:
 	erts_print(to, to_arg, "#Bin");
 	break;
+    case MATCHSTATE_DEF:
+        erts_print(to, to_arg, "#Matchstate");
+        break;
     default:
 	erts_print(to, to_arg, "unknown object %x", obj);
     }
diff --git a/erts/emulator/beam/erl_printf_term.c b/erts/emulator/beam/erl_printf_term.c
index 267c0b3ff4..2917d58932 100644
--- a/erts/emulator/beam/erl_printf_term.c
+++ b/erts/emulator/beam/erl_printf_term.c
@@ -467,10 +467,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
 	}
 	    break;
 	case BINARY_DEF:
-	    if (header_is_bin_matchstate(*boxed_val(wobj))) {
-		PRINT_STRING(res, fn, arg, "#MatchState");
-	    }
-	    else {
+	    {
 		byte* bytep;
 		Uint bytesize = binary_size_rel(obj,obj_base);
 		Uint bitoffs;
@@ -633,6 +630,9 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
                 }
             }
             break;
+	case MATCHSTATE_DEF:
+	    PRINT_STRING(res, fn, arg, "#MatchState");
+	    break;
         default:
 	    PRINT_STRING(res, fn, arg, "<unknown:");
 	    PRINT_POINTER(res, fn, arg, wobj);
diff --git a/erts/emulator/beam/erl_term.c b/erts/emulator/beam/erl_term.c
index 89459fb278..e5050bfaa5 100644
--- a/erts/emulator/beam/erl_term.c
+++ b/erts/emulator/beam/erl_term.c
@@ -91,6 +91,7 @@ unsigned tag_val_def(Wterm x)
 	    case (_TAG_HEADER_REFC_BIN >> _TAG_PRIMARY_SIZE):	return BINARY_DEF;
 	    case (_TAG_HEADER_HEAP_BIN >> _TAG_PRIMARY_SIZE):	return BINARY_DEF;
 	    case (_TAG_HEADER_SUB_BIN >> _TAG_PRIMARY_SIZE):	return BINARY_DEF;
+	    case (_TAG_HEADER_BIN_MATCHSTATE >> _TAG_PRIMARY_SIZE): return MATCHSTATE_DEF;
 	  }
  
 	  break;
diff --git a/erts/emulator/beam/erl_term.h b/erts/emulator/beam/erl_term.h
index 90e35151b0..d5e91d80d9 100644
--- a/erts/emulator/beam/erl_term.h
+++ b/erts/emulator/beam/erl_term.h
@@ -1136,8 +1136,9 @@ _ET_DECLARE_CHECKED(Uint,y_reg_index,Uint)
 #define FLOAT_DEF		0xe
 #define BIG_DEF			0xf
 #define SMALL_DEF		0x10
+#define MATCHSTATE_DEF          0x11   /* not a "real" term */
 
-#define FIRST_VACANT_TAG_DEF    0x11
+#define FIRST_VACANT_TAG_DEF    0x12
 
 #if ET_DEBUG
 extern unsigned tag_val_def_debug(Wterm, const char*, unsigned);
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index 342e91e983..e9d7c91ac9 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -844,7 +844,6 @@ Uint32 make_hash(Eterm term_arg)
     Eterm hash = 0;
     unsigned op;
 
-    /* Must not collide with the real tag_val_def's: */
 #define MAKE_HASH_TUPLE_OP      (FIRST_VACANT_TAG_DEF)
 #define MAKE_HASH_TERM_ARRAY_OP (FIRST_VACANT_TAG_DEF+1)
 #define MAKE_HASH_CDR_PRE_OP    (FIRST_VACANT_TAG_DEF+2)
diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl
index c6cc414bba..3f986ca2ed 100644
--- a/erts/emulator/test/match_spec_SUITE.erl
+++ b/erts/emulator/test/match_spec_SUITE.erl
@@ -170,12 +170,11 @@ test_1(Config) when is_list(Config) ->
 	     [{['$1','$1'],[{is_atom, '$1'}],[kakalorum]}],
 	     [{call, {?MODULE, f2, [a, a]}}]),
 
-%    case tr0(fun() -> ?MODULE:f2(a, a) end,
-%	     {?MODULE, f2, 2},
-%	     [{['$1','$1'],[{is_atom, '$1'}],[{message, {process_dump}}]}]) of
-%	[{trace, _, call, {?MODULE, f2, [a, a]}, Bin}] ->
-%	    erlang:display(binary_to_list(Bin))
-%    end,
+    %% Verify that 'process_dump' can handle a matchstate on the stack.
+    tr(fun() -> fbinmatch(<<0>>, 0) end,
+       {?MODULE, f1, 1},
+       [{['_'],[],[{message, {process_dump}}]}],
+       [fun({trace, _, call, {?MODULE, f1, [0]}, _Bin}) -> true end]),
 
 % Error cases
     ?line errchk([{['$1','$1'],[{is_atom, '$1'}],[{banka, kanin}]}]),
@@ -999,14 +998,14 @@ tr(Fun, MFA, TraceFlags, Pat, PatFlags, Expected0) ->
 	       erlang:trace(P, true, TraceFlags),
 	       erlang:trace_pattern(MFA, Pat, PatFlags),
 	       lists:map(
-		 fun(X) -> 
-			 list_to_tuple([trace, P | tuple_to_list(X)])
+		 fun(X) when is_function(X,1) -> X;
+		    (X) -> list_to_tuple([trace, P | tuple_to_list(X)])
 		 end,
 		 Expected0)
        end).
 
 tr(RunFun, ControlFun) ->
-    P = spawn(?MODULE, runner, [self(), RunFun]),
+    P = spawn_link(?MODULE, runner, [self(), RunFun]),
     collect(P, ControlFun(P)).
 
 collect(P, TMs) ->
@@ -1025,18 +1024,33 @@ collect([]) ->
 collect([TM | TMs]) ->
     ?t:format(        "Expecting:      ~p~n", [TM]),
     receive
-	M ->
-	    case if element(1, M) == trace_ts ->
-			 list_to_tuple(lists:reverse(
-					 tl(lists:reverse(tuple_to_list(M)))));
-		    true -> M
-		 end of
-		TM ->
-		    ?t:format("Got:            ~p~n", [M]),
-		    collect(TMs);
-		_ ->
-		    ?t:format("Got unexpected: ~p~n", [M]),
-		    flush({got_unexpected,M})
+	M0 ->
+	    M = case element(1, M0) of
+		    trace_ts ->
+			list_to_tuple(lists:reverse(
+					tl(lists:reverse(tuple_to_list(M0)))));
+		    _ -> M0
+		end,
+	    case is_function(TM,1) of
+		true ->
+		    case (catch TM(M)) of
+			true ->
+			    ?t:format("Got:            ~p~n", [M]),
+			    collect(TMs);
+			_ ->
+			    ?t:format("Got unexpected: ~p~n", [M]),
+			    flush({got_unexpected,M})
+		    end;
+
+		false ->
+		    case M of
+			TM ->
+			    ?t:format("Got:            ~p~n", [M]),
+			    collect(TMs);
+			_ ->
+			    ?t:format("Got unexpected: ~p~n", [M]),
+			    flush({got_unexpected,M})
+		    end
 	    end
     end.
 
@@ -1116,6 +1130,10 @@ fn(X, Y) ->
 fn(X, Y, Z) ->
     [X, Y, Z].
 
+fbinmatch(<<Int, Rest/binary>>, Acc) ->
+    fbinmatch(Rest, [?MODULE:f1(Int) | Acc]);
+fbinmatch(<<>>, Acc) -> Acc.
+
 id(X) ->
     X.