diff options
| author | Hans Bolinder <[email protected]> | 2016-09-12 08:48:10 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-09-12 08:48:10 +0200 |
| commit | 86d1fb0865193cce4e308baa6472885a81033f10 (patch) | |
| tree | e062f4f7a55175d223657181c73d2a3a1d3837d1 /lib/hipe/cerl/erl_bif_types.erl | |
| parent | d657917bec8805efeec3cfe6a45edf462b2e73e5 (diff) | |
| parent | 5a9cc02690d033a2f3e695d7ac42c2756dbaaf04 (diff) | |
| download | otp-86d1fb0865193cce4e308baa6472885a81033f10.tar.gz otp-86d1fb0865193cce4e308baa6472885a81033f10.tar.bz2 otp-86d1fb0865193cce4e308baa6472885a81033f10.zip | |
Merge branch 'margnus1/dialyzer/fix_maps_opaque/ERL-249/PR-1161/OTP-13878' into maint
* margnus1/dialyzer/fix_maps_opaque/ERL-249/PR-1161/OTP-13878:
erl_bif_types: Properly unopaque maps:merge/2 args
Diffstat (limited to 'lib/hipe/cerl/erl_bif_types.erl')
| -rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index 9453ca6c6f..230fce2e68 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -124,7 +124,7 @@ t_map_entries/2, t_map_put/3, t_map_update/3, - map_pairwise_merge/3 + t_map_pairwise_merge/4 ]). -ifdef(DO_ERL_BIF_TYPES_TEST). @@ -1689,10 +1689,10 @@ type(maps, merge, 2, Xs, Opaques) -> BDefK = t_map_def_key(MapB, Opaques), ADefV = t_map_def_val(MapA, Opaques), BDefV = t_map_def_val(MapB, Opaques), - t_map(map_pairwise_merge( + t_map(t_map_pairwise_merge( fun(K, _, _, mandatory, V) -> {K, mandatory, V}; (K, MNess, VA, optional, VB) -> {K, MNess, t_sup(VA,VB)} - end, MapA, MapB), + end, MapA, MapB, Opaques), t_sup(ADefK, BDefK), t_sup(ADefV, BDefV)) end, Opaques); type(maps, put, 3, Xs, Opaques) -> |