Merge branch 'egil/fix-dialyzer-map-key-coalescing/OTP-12347' into maint

* egil/fix-dialyzer-map-key-coalescing/OTP-12347:
  dialyzer: Test recoalesced map keys
  compiler: Coalesce map keys in dialyzer mode

1 files changed, 36 insertions, 0 deletions

diff --git a/lib/dialyzer/test/small_SUITE_data/src/maps1.erl b/lib/dialyzer/test/small_SUITE_data/src/maps1.erl
index 06ced5b69e..228ffe2c22 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/maps1.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/maps1.erl
@@ -10,6 +10,7 @@
 
 
 -export([recv/3, decode/1]).
+-export([get_my_map/0,is_my_map/1]).
 
 %-record(can_pkt, {id, data :: binary(), timestamp}).
 
@@ -39,3 +40,38 @@ t2() -> ok.
 
 update(#{ id := Id, val := Val } = M, X) when is_integer(Id) ->
     M#{ val := [Val,X] }.
+
+%% key coalescing
+
+-spec get_my_map() -> map().
+
+get_my_map() ->
+    #{labels  => [one, two],
+      number  => 27,
+      [1,2,3] => wer,
+      {4,5,6} => sdf,
+      kvok    => #{
+	<<"wat">> => v,
+	a => qwe,
+	2 => asd,
+	[1,2,3] => wer,
+	{4,5,6} => sdf,
+	"abc" => zxc
+       }
+     }.
+
+-spec is_my_map(map()) -> 'ok'.
+
+is_my_map(#{labels  := [one, two],
+	    number  := 27,
+	    [1,2,3] := wer,
+	    {4,5,6} := sdf,
+	    kvok := #{
+	      <<"wat">> := v,
+	      a := qwe,
+	      2 := asd,
+	      [1,2,3] := wer,
+	      {4,5,6} := sdf,
+	      "abc" := zxc
+	     }
+	   }) -> ok.