aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-11-09 16:01:32 +0100
committerHenrik Nord <[email protected]>2015-11-09 16:01:32 +0100
commit43f002094792f08c061fb5e169069522bb8a3de7 (patch)
tree5b74b5b4fd9f7b5da64c188c4c7dc09ba5d53b4e /lib/compiler/src
parentce4ba8d71fe41fa827f35f8c75917d76125fa8ab (diff)
parent60b7e6ce0925204b5e70f4d0b4b3ac596455bb93 (diff)
downloadotp-43f002094792f08c061fb5e169069522bb8a3de7.tar.gz
otp-43f002094792f08c061fb5e169069522bb8a3de7.tar.bz2
otp-43f002094792f08c061fb5e169069522bb8a3de7.zip
Merge branch 'maint'
Diffstat (limited to 'lib/compiler/src')
-rw-r--r--lib/compiler/src/cerl_trees.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/compiler/src/cerl_trees.erl b/lib/compiler/src/cerl_trees.erl
index 2c9b72a30b..58bb18e34a 100644
--- a/lib/compiler/src/cerl_trees.erl
+++ b/lib/compiler/src/cerl_trees.erl
@@ -731,8 +731,8 @@ label(T, N, Env) ->
{ann_c_map(As, M, Ts), N3};
map_pair ->
{Op, N1} = label(map_pair_op(T), N, Env),
- {Val, N2} = label(map_pair_key(T), N1, Env),
- {Key, N3} = label(map_pair_val(T), N2, Env),
+ {Key, N2} = label(map_pair_key(T), N1, Env),
+ {Val, N3} = label(map_pair_val(T), N2, Env),
{As, N4} = label_ann(T, N3),
{ann_c_map_pair(As,Op,Key,Val), N4};
'let' ->