diff options
| author | Erlang/OTP <[email protected]> | 2015-09-07 17:49:18 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-09-07 17:49:18 +0200 |
| commit | 5794d3d4bf28a33be1e6c802d709c305f23773c0 (patch) | |
| tree | 1c068d838c7f4d48a216fc9de93afec64328215d /erts/emulator/beam/erl_printf_term.c | |
| parent | a5d9e2b280ed25194d3391d6de975d328bf65a9c (diff) | |
| parent | 0c52e3c18da16dbb896871865b71093b8c5617c4 (diff) | |
| download | otp-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_printf_term.c')
| -rw-r--r-- | erts/emulator/beam/erl_printf_term.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_printf_term.c b/erts/emulator/beam/erl_printf_term.c index d18760dc43..ba9a174fdf 100644 --- a/erts/emulator/beam/erl_printf_term.c +++ b/erts/emulator/beam/erl_printf_term.c @@ -441,11 +441,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount, PRINT_DOUBLE(res, fn, arg, 'e', 6, 0, ff.fd); } break; - case BINARY_DEF: - if (header_is_bin_matchstate(*boxed_val(wobj))) { - PRINT_STRING(res, fn, arg, "#MatchState"); - } - else { + case BINARY_DEF: { ProcBin* pb = (ProcBin *) binary_val(wobj); if (pb->size == 1) PRINT_STRING(res, fn, arg, "<<1 byte>>"); @@ -519,6 +515,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); |