From 91e3f8f65963ada7b923fcf8531baaca24f484db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Fri, 21 Feb 2014 15:48:57 +0100
Subject: compiler: Add variable coverage of map in cerl

---
 lib/compiler/src/cerl.erl       | 17 +++++++++++------
 lib/compiler/src/cerl_trees.erl | 20 +++++++++++---------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/lib/compiler/src/cerl.erl b/lib/compiler/src/cerl.erl
index 60a8559950..3c121f3b04 100644
--- a/lib/compiler/src/cerl.erl
+++ b/lib/compiler/src/cerl.erl
@@ -124,8 +124,9 @@
 
 	 %% keep map exports here for now
 	 map_es/1,
-	 update_c_map/2,
-	 ann_c_map/2,
+	 map_val/1,
+	 update_c_map/3,
+	 ann_c_map/3,
 	 map_pair_op/1,map_pair_key/1,map_pair_val/1,
 	 update_c_map_pair/4,
 	 ann_c_map_pair/4
@@ -1579,11 +1580,15 @@ ann_make_list(_, [], Node) ->
 map_es(#c_map{es = Es}) ->
     Es.
 
-ann_c_map(As, Es) ->
-    #c_map{es = Es, anno = As }.
+-spec map_val(c_map()) -> cerl().
+map_val(#c_map{var = M}) ->
+    M.
 
-update_c_map(Old, Es) ->
-    #c_map{es = Es, anno = get_ann(Old)}.
+ann_c_map(As,M,Es) ->
+    #c_map{var=M,es = Es, anno = As }.
+
+update_c_map(Old,M,Es) ->
+    #c_map{var=M, es = Es, anno = get_ann(Old)}.
 
 map_pair_key(#c_map_pair{key=K}) -> K.
 map_pair_val(#c_map_pair{val=V}) -> V.
diff --git a/lib/compiler/src/cerl_trees.erl b/lib/compiler/src/cerl_trees.erl
index 2542841eef..2ebeab243f 100644
--- a/lib/compiler/src/cerl_trees.erl
+++ b/lib/compiler/src/cerl_trees.erl
@@ -57,9 +57,9 @@
 	       update_c_try/6, update_c_tuple/2, update_c_tuple_skel/2,
 	       update_c_values/2, values_es/1, var_name/1,
 
-	       map_es/1, 
-	       ann_c_map/2,
-	       update_c_map/2,
+	       map_val/1, map_es/1,
+	       ann_c_map/3,
+	       update_c_map/3,
 	       map_pair_key/1,map_pair_val/1,map_pair_op/1,
 	       ann_c_map_pair/4,
 	       update_c_map_pair/4
@@ -138,7 +138,7 @@ map_1(F, T) ->
  	tuple ->
 	    update_c_tuple_skel(T, map_list(F, tuple_es(T)));
  	map ->
-	    update_c_map(T, map_list(F, map_es(T)));
+	    update_c_map(T, map(F,map_val(T)), map_list(F, map_es(T)));
 	map_pair ->
 	    update_c_map_pair(T, map(F, map_pair_op(T)),
                                  map(F, map_pair_key(T)),
@@ -372,8 +372,9 @@ mapfold(F, S0, T) ->
 	    {Ts, S1} = mapfold_list(F, S0, tuple_es(T)),
 	    F(update_c_tuple_skel(T, Ts), S1);
 	map ->
-	    {Ts, S1} = mapfold_list(F, S0, map_es(T)),
-	    F(update_c_map(T, Ts), S1);
+	    {M , S1} = mapfold(F, S0, map_val(T)),
+	    {Ts, S2} = mapfold_list(F, S1, map_es(T)),
+	    F(update_c_map(T, M, Ts), S2);
 	map_pair ->
 	    {Op,  S1} = mapfold(F, S0, map_pair_op(T)),
 	    {Key, S2} = mapfold(F, S1, map_pair_key(T)),
@@ -723,9 +724,10 @@ label(T, N, Env) ->
 	    {As, N2} = label_ann(T, N1),
 	    {ann_c_tuple_skel(As, Ts), N2};
  	map ->
-	    {Ts, N1} = label_list(map_es(T), N, Env),
-	    {As, N2} = label_ann(T, N1),
-	    {ann_c_map(As, Ts), N2};
+	    {M,  N1} = label(map_val(T), N, Env),
+	    {Ts, N2} = label_list(map_es(T), N1, Env),
+	    {As, N3} = label_ann(T, N2),
+	    {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),
-- 
cgit v1.2.3