diff options
| author | Hans Bolinder <[email protected]> | 2016-09-12 08:49:59 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-09-12 08:49:59 +0200 |
| commit | f792ea463770bbd4464cef347aef6e3f8606687b (patch) | |
| tree | a877b1275d60fce81be88e03ad393a660017f24c /lib/hipe/cerl/erl_bif_types.erl | |
| parent | c3c41c51ac2856610a70a3dd6ac54852c0742183 (diff) | |
| parent | 86d1fb0865193cce4e308baa6472885a81033f10 (diff) | |
| download | otp-f792ea463770bbd4464cef347aef6e3f8606687b.tar.gz otp-f792ea463770bbd4464cef347aef6e3f8606687b.tar.bz2 otp-f792ea463770bbd4464cef347aef6e3f8606687b.zip | |
Merge branch 'maint'
* maint:
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 32d5d39460..c9cc1cfe25 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). @@ -1695,10 +1695,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) -> |