Merge branch 'bjorn/compiler/map-fixes'

* bjorn/compiler/map-fixes:
  cerl: Remove a clause in fold_map_pairs/3 that will never be reached
  Move grouping of map constructions from v3_core to v3_kernel
  core_pp: Correct printing of map literals
  Strengthen and modernize compile_SUITE
  core_parse: Always fold literal conses
  cerl: Make sure that we preserve the invariants for maps
  cerl_clauses: Fix indentation
  sys_core_fold: Strengthen optimization of letrecs in effect context
  Fix handling of binary map keys in comprehensions
  core_lib: Teach is_var_used/2 to handle keys in map patterns
  warnings_SUITE: Eliminate compiler warning for a shadowed variable
  lc_SUITE: Add shadow/1
  Modernize lc_SUITE

1 files changed, 9 insertions, 4 deletions

diff --git a/lib/compiler/src/core_lib.erl b/lib/compiler/src/core_lib.erl
index 0d95971f91..730e3a5317 100644
--- a/lib/compiler/src/core_lib.erl
+++ b/lib/compiler/src/core_lib.erl
@@ -236,10 +236,15 @@ vu_pat_seg_list(V, Ss, St) ->
 			end
 		end, St, Ss).
 
-vu_map_pairs(V, [#c_map_pair{val=Pat}|T], St0) ->
-    case vu_pattern(V, Pat, St0) of
-	{true,_}=St -> St;
-	St -> vu_map_pairs(V, T, St)
+vu_map_pairs(V, [#c_map_pair{key=Key,val=Pat}|T], St0) ->
+    case vu_expr(V, Key) of
+	true ->
+	    {true,false};
+	false ->
+	    case vu_pattern(V, Pat, St0) of
+		{true,_}=St -> St;
+		St -> vu_map_pairs(V, T, St)
+	    end
     end;
 vu_map_pairs(_, [], St) -> St.