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, 16 insertions, 2 deletions

diff --git a/lib/compiler/test/match_SUITE.erl b/lib/compiler/test/match_SUITE.erl
index 033988e4c8..74efed7588 100644
--- a/lib/compiler/test/match_SUITE.erl
+++ b/lib/compiler/test/match_SUITE.erl
@@ -22,7 +22,8 @@
 	 init_per_group/2,end_per_group/2,
 	 pmatch/1,mixed/1,aliases/1,match_in_call/1,
 	 untuplify/1,shortcut_boolean/1,letify_guard/1,
-	 selectify/1,underscore/1,match_map/1,coverage/1]).
+	 selectify/1,underscore/1,match_map/1,map_vars_used/1,
+      coverage/1]).
 	 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -36,7 +37,7 @@ groups() ->
     [{p,[parallel],
       [pmatch,mixed,aliases,match_in_call,untuplify,
        shortcut_boolean,letify_guard,selectify,
-       underscore,match_map,coverage]}].
+       underscore,match_map,map_vars_used,coverage]}].
 
 
 init_per_suite(Config) ->
@@ -412,6 +413,19 @@ do_match_map(#s{map=#{key:=Val}}=S) ->
     %% Would crash with a 'badarg' exception.
     S#s{t=Val}.
 
+map_vars_used(Config) when is_list(Config) ->
+    {some,value} = do_map_vars_used(a, b, #{{a,b}=>42,v=>{some,value}}),
+    ok.
+
+do_map_vars_used(X, Y, Map) ->
+    case {X,Y} of
+	T ->
+	    %% core_lib:is_var_used/2 would not consider T used.
+	    #{T:=42,v:=Val} = Map,
+	    Val
+    end.
+
+
 coverage(Config) when is_list(Config) ->
     %% Cover beam_dead.
     ok = coverage_1(x, a),