aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_debug.c
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-09-07 17:49:18 +0200
committerErlang/OTP <[email protected]>2015-09-07 17:49:18 +0200
commit5794d3d4bf28a33be1e6c802d709c305f23773c0 (patch)
tree1c068d838c7f4d48a216fc9de93afec64328215d /erts/emulator/beam/erl_debug.c
parenta5d9e2b280ed25194d3391d6de975d328bf65a9c (diff)
parent0c52e3c18da16dbb896871865b71093b8c5617c4 (diff)
downloadotp-5794d3d4bf28a33be1e6c802d709c305f23773c0.tar.gz
otp-5794d3d4bf28a33be1e6c802d709c305f23773c0.tar.bz2
otp-5794d3d4bf28a33be1e6c802d709c305f23773c0.zip
Merge branch 'sverk/trace-process_dump-matchstate-17/OTP-12968' into maint-17
* sverk/trace-process_dump-matchstate-17/OTP-12968: erts: Add testcase for tracing whith 'process_dump' erts: Fix bug when tracing with 'process_dump'
Diffstat (limited to 'erts/emulator/beam/erl_debug.c')
-rw-r--r--erts/emulator/beam/erl_debug.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_debug.c b/erts/emulator/beam/erl_debug.c
index 50bdc79506..b6c131a43e 100644
--- a/erts/emulator/beam/erl_debug.c
+++ b/erts/emulator/beam/erl_debug.c
@@ -188,6 +188,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);
}