Merge branch 'egil/compiler/strengthen-tests'

* egil/compiler/strengthen-tests:
  compiler: Teach beam_disasm has_map_field instruction
  compiler: Fold binary Map key patterns to literals
  compiler: Strengthen listings tests
  compiler: Strengthen Maps tests

2 files changed, 24 insertions, 4 deletions

diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl
index e0d0d0fd1d..57fdf95677 100644
--- a/lib/compiler/src/beam_disasm.erl
+++ b/lib/compiler/src/beam_disasm.erl
@@ -1134,7 +1134,7 @@ resolve_inst({line,[Index]},_,_,_) ->
     {line,resolve_arg(Index)};
 
 %%
-%% R17A.
+%% 17.0
 %%
 resolve_inst({put_map_assoc,Args},_,_,_) ->
     [FLbl,Src,Dst,{u,N},{{z,1},{u,_Len},List0}] = Args,
@@ -1150,6 +1150,10 @@ resolve_inst({is_map,Args0},_,_,_) ->
     [FLbl|Args] = resolve_args(Args0),
     {test, is_map, FLbl, Args};
 
+resolve_inst({has_map_field,Args0},_,_,_) ->
+    [FLbl|Args] = resolve_args(Args0),
+    {test,has_map_field,FLbl,Args};
+
 resolve_inst({get_map_element,Args},_,_,_) ->
     [FLbl,Src,Key,Dst] = resolve_args(Args),
     {get_map_element,FLbl,Src,Key,Dst};
diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index 1cdbac5693..d1eec9e347 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -598,6 +598,14 @@ eval_binary_1([#c_bitstr{val=#c_literal{val=Val},size=#c_literal{val=Sz},
 	error:_ ->
 	    throw(impossible)
     end;
+eval_binary_1([#c_bitstr{val=#c_literal{},size=#c_literal{},
+			 unit=#c_literal{},type=#c_literal{},
+			 flags=#c_cons{}=Flags}=Bitstr|Ss], Acc0) ->
+    case cerl:fold_literal(Flags) of
+	#c_literal{} = Flags1 ->
+	    eval_binary_1([Bitstr#c_bitstr{flags=Flags1}|Ss], Acc0);
+	_ -> throw(impossible)
+    end;
 eval_binary_1([], Acc) -> Acc;
 eval_binary_1(_, _) -> throw(impossible).
 
@@ -1536,9 +1544,17 @@ map_pair_pattern_list(Ps0, Isub, Osub0) ->
     {Ps,{_,Osub}} = mapfoldl(fun map_pair_pattern/2, {Isub,Osub0}, Ps0),
     {Ps,Osub}.
 
-map_pair_pattern(#c_map_pair{op=#c_literal{val=exact},key=K0,val=V0}=Pair, {Isub,Osub0}) ->
-    {K,Osub1} = pattern(K0, Isub, Osub0),
-    {V,Osub} = pattern(V0, Isub, Osub1),
+map_pair_pattern(#c_map_pair{op=#c_literal{val=exact},key=K0,val=V0}=Pair,{Isub,Osub0}) ->
+    {K,Osub1} = case cerl:type(K0) of
+	binary ->
+	    K1 = eval_binary(K0),
+	    case cerl:type(K1) of
+		literal -> {K1,Osub0};
+		_ -> pattern(K0,Isub,Osub0)
+	    end;
+	_ -> pattern(K0,Isub,Osub0)
+    end,
+    {V,Osub} = pattern(V0,Isub,Osub1),
     {Pair#c_map_pair{key=K,val=V},{Isub,Osub}}.
 
 bin_pattern_list(Ps0, Isub, Osub0) ->