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
  ...

1 files changed, 24 insertions, 0 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.