Merge branch 'egil/maps/variable-keys/OTP-12218'

* egil/maps/variable-keys/OTP-12218: (22 commits)
  compiler: Update test for Maps aliasing
  compiler: Properly support Map aliasing
  compiler: Refactor Map pairs aliasing
  compiler: Fix harmless need_heap error for Maps
  stdlib: Update Map tests
  stdlib: Use environment bindings for Maps keys in erl_eval matching
  debugger: Update Map tests
  compiler: Update Map tests
  compiler: Fix v3_core Maps pair chains
  compiler: Use expressions in core patterns
  compiler: Use variables in Map cerl inliner
  compiler: Reintroduce binary limit for Map keys
  compiler: Shameless v3_core hack for variables
  compiler: Use variables in Map beam assmebler
  compiler: Use variables in Map kernel pass
  compiler: Use variables in Map core pass
  compiler: Normalize unary ops on Maps key literals
  stdlib: Update Map tests
  stdlib: erl_lint Map key variables
  compiler: Maps are always patterns never values in matching
  ...

2 files changed, 31 insertions, 9 deletions

diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index b55324161b..3427f431c5 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -1458,6 +1458,30 @@ eep43(Config) when is_list(Config) ->
           "lists:map(fun (X) -> X#{price := 0} end,
                      [#{hello => 0, price => nil}]).",
           [#{hello => 0, price => 0}]),
+    check(fun () ->
+		Map = #{ <<33:333>> => "wat" },
+		#{ <<33:333>> := "wat" } = Map
+	  end,
+	  "begin "
+	  "   Map = #{ <<33:333>> => \"wat\" }, "
+	  "   #{ <<33:333>> := \"wat\" } = Map  "
+	  "end.",
+	  #{ <<33:333>> => "wat" }),
+    check(fun () ->
+		K1 = 1,
+		K2 = <<42:301>>,
+		K3 = {3,K2},
+		Map = #{ K1 => 1, K2 => 2, K3 => 3, {2,2} => 4},
+		#{ K1 := 1, K2 := 2, K3 := 3, {2,2} := 4} = Map
+	  end,
+	  "begin "
+	  "    K1 = 1, "
+	  "    K2 = <<42:301>>, "
+	  "    K3 = {3,K2}, "
+	  "    Map = #{ K1 => 1, K2 => 2, K3 => 3, {2,2} => 4}, "
+	  "    #{ K1 := 1, K2 := 2, K3 := 3, {2,2} := 4} = Map "
+	  "end.",
+	  #{ 1 => 1, <<42:301>> => 2, {3,<<42:301>>} => 3, {2,2} => 4}),
     error_check("[camembert]#{}.", {badarg,[camembert]}),
     error_check("#{} = 1.", {badmatch,1}),
     ok.
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 27f95bd3fa..f8a99f653a 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -3667,7 +3667,8 @@ maps(Config) ->
                    g := 1 + 1,
                    h := _,
                    i := (_X = _Y),
-                   j := (x ! y) }) ->
+                   j := (x ! y),
+		   <<0:300>> := 33}) ->
                   {A,F}.
             ">>,
            [],
@@ -3680,9 +3681,10 @@ maps(Config) ->
 	   {errors,[{1,erl_lint,illegal_map_construction},
                     {1,erl_lint,{unbound_var,'X'}}],
             []}},
-	  {errors_in_map_keys,
+	  {legal_map_construction,
 	   <<"t(V) -> #{ a => 1,
 			#{a=>V} => 2,
+			#{{a,V}=>V} => 2,
 			#{ \"hi\" => wazzup, hi => ho } => yep,
 			[try a catch _:_ -> b end] => nope,
 			ok => 1.0,
@@ -3694,11 +3696,7 @@ maps(Config) ->
 		      }.
 	   ">>,
 	   [],
-	   {errors,[{2,erl_lint,{illegal_map_key_variable,'V'}},
-		    {4,erl_lint,illegal_map_key},
-		    {6,erl_lint,illegal_map_key},
-		    {8,erl_lint,illegal_map_key},
-		    {10,erl_lint,illegal_map_key}],[]}},
+	   []},
 	   {errors_in_map_keys_pattern,
 	   <<"t(#{ a := 2,
 	           #{} := A,
@@ -3709,8 +3707,8 @@ maps(Config) ->
 	       A.
 	   ">>,
 	   [],
-	   {errors,[{4,erl_lint,illegal_map_key},
-		    {6,erl_lint,{illegal_map_key_variable,'V'}}],[]}}],
+	   {errors,[{4,erl_lint,illegal_map_construction},
+		    {6,erl_lint,illegal_map_key}],[]}}],
     [] = run(Config, Ts),
     ok.