aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2019-01-08 12:23:28 +0100
committerLars Thorsen <[email protected]>2019-01-08 12:23:28 +0100
commit0d218ea065dcb087a2ca0fafa1f447c4c73cea84 (patch)
tree03694bdd310b66a72bcfc041df7186cd06252982 /lib/stdlib
parente2fdbdf1502ec46cf25a2cb399febd23b480469f (diff)
parent91e5207a14ff50bfc42aa9bcf2219cc2f4af63f8 (diff)
downloadotp-0d218ea065dcb087a2ca0fafa1f447c4c73cea84.tar.gz
otp-0d218ea065dcb087a2ca0fafa1f447c4c73cea84.tar.bz2
otp-0d218ea065dcb087a2ca0fafa1f447c4c73cea84.zip
Merge branch 'maint'
* maint: [xmerl] Fix detect charset crash [cdv] Check only own persistent terms in crashdump_viewer test Fix remote-call error in ms_transform Conflicts: lib/observer/test/crashdump_helper.erl
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/src/ms_transform.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/ms_transform.erl b/lib/stdlib/src/ms_transform.erl
index 6d243e1bec..97ec785c62 100644
--- a/lib/stdlib/src/ms_transform.erl
+++ b/lib/stdlib/src/ms_transform.erl
@@ -556,8 +556,8 @@ tg({call, Line, {remote,_,{atom,_,erlang},{atom, Line2, FunName}},ParaList},
FunName,length(ParaList)}})
end;
tg({call, Line, {remote,_,{atom,_,ModuleName},
- {atom, _, FunName}},_ParaList},B) ->
- throw({error,Line,{?ERR_GENREMOTECALL+B#tgd.eb,ModuleName,FunName}});
+ {atom, _, FunName}},ParaList},B) ->
+ throw({error,Line,{?ERR_GENREMOTECALL+B#tgd.eb,ModuleName,FunName,length(ParaList)}});
tg({cons,Line, H, T},B) ->
{cons, Line, tg(H,B), tg(T,B)};
tg({nil, Line},_B) ->