diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-03-25 10:40:33 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-03-25 10:40:33 +0100 |
| commit | 7379c418ce610f3cd5a69fd4260efbc0246b994a (patch) | |
| tree | 965b150ee46757a75dfb25020c37ebcea983ec08 | |
| parent | fdd3ac10233e9c70dc127ee93835298eaaf60074 (diff) | |
| parent | dcf096a77d94a16d46ae553263f9dcd3be5a884b (diff) | |
| download | otp-7379c418ce610f3cd5a69fd4260efbc0246b994a.tar.gz otp-7379c418ce610f3cd5a69fd4260efbc0246b994a.tar.bz2 otp-7379c418ce610f3cd5a69fd4260efbc0246b994a.zip | |
Merge branch 'maint'
Conflicts:
erts/emulator/beam/erl_map.c
erts/emulator/test/map_SUITE.erl
| -rw-r--r-- | erts/emulator/beam/bif.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_map.c | 4 | ||||
| -rw-r--r-- | erts/emulator/test/map_SUITE.erl | 43 |
3 files changed, 46 insertions, 3 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index af02a55b69..cc20ec7440 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -4754,7 +4754,7 @@ BIF_RETTYPE bump_reductions_1(BIF_ALIST_1) } BIF_RETTYPE erts_internal_cmp_term_2(BIF_ALIST_2) { - int res = CMP_TERM(BIF_ARG_1,BIF_ARG_2); + Sint res = CMP_TERM(BIF_ARG_1,BIF_ARG_2); /* ensure -1, 0, 1 result */ if (res < 0) { diff --git a/erts/emulator/beam/erl_map.c b/erts/emulator/beam/erl_map.c index bcbda65da0..12e359ee02 100644 --- a/erts/emulator/beam/erl_map.c +++ b/erts/emulator/beam/erl_map.c @@ -937,7 +937,7 @@ static Eterm flatmap_merge(Process *p, Eterm nodeA, Eterm nodeB) { Eterm *ks,*vs,*ks1,*vs1,*ks2,*vs2; flatmap_t *mp1,*mp2,*mp_new; Uint n,n1,n2,i1,i2,need,unused_size=0; - int c = 0; + Sint c = 0; mp1 = (flatmap_t*)flatmap_val(nodeA); mp2 = (flatmap_t*)flatmap_val(nodeB); @@ -2504,7 +2504,7 @@ int erts_validate_and_sort_flatmap(flatmap_t* mp) Uint sz = flatmap_get_size(mp); Uint ix,jx; Eterm tmp; - int c; + Sint c; /* sort */ diff --git a/erts/emulator/test/map_SUITE.erl b/erts/emulator/test/map_SUITE.erl index 1da08beb8b..241f901188 100644 --- a/erts/emulator/test/map_SUITE.erl +++ b/erts/emulator/test/map_SUITE.erl @@ -63,6 +63,7 @@ %% misc t_hashmap_balance/1, + t_erts_internal_order/1, t_pdict/1, t_ets/1, t_dets/1, @@ -113,6 +114,7 @@ all() -> [ %% Other functions t_hashmap_balance, + t_erts_internal_order, t_pdict, t_ets, t_tracing @@ -1492,6 +1494,47 @@ hashmap_nodes(M) -> 0, Info). +t_erts_internal_order(_Config) when is_list(_Config) -> + + -1 = erts_internal:cmp_term(1,2), + 1 = erts_internal:cmp_term(2,1), + 0 = erts_internal:cmp_term(2,2), + + + -1 = erts_internal:cmp_term(1,a), + 1 = erts_internal:cmp_term(a,1), + 0 = erts_internal:cmp_term(a,a), + + -1 = erts_internal:cmp_term(1,1.0), + 1 = erts_internal:cmp_term(1.0,1), + 0 = erts_internal:cmp_term(1.0,1.0), + + -1 = erts_internal:cmp_term(1,1 bsl 65), + 1 = erts_internal:cmp_term(1 bsl 65,1), + 0 = erts_internal:cmp_term(1 bsl 65, 1 bsl 65), + + -1 = erts_internal:cmp_term(1 bsl 65,float(1)), + 1 = erts_internal:cmp_term(float(1),1 bsl 65), + -1 = erts_internal:cmp_term(1,float(1 bsl 65)), + 1 = erts_internal:cmp_term(float(1 bsl 65),1), + 0 = erts_internal:cmp_term(float(1 bsl 65), float(1 bsl 65)), + + %% reported errors + -1 = erts_internal:cmp_term(0,2147483648), + 0 = erts_internal:cmp_term(2147483648,2147483648), + 1 = erts_internal:cmp_term(2147483648,0), + + M = #{0 => 0,2147483648 => 0}, + true = M =:= binary_to_term(term_to_binary(M)), + + F1 = fun(_, _) -> 0 end, + F2 = fun(_, _) -> 1 end, + M0 = maps:from_list( [{-2147483649, 0}, {0,0}, {97, 0}, {false, 0}, {flower, 0}, {F1, 0}, {F2, 0}, {<<>>, 0}]), + M1 = maps:merge(M0, #{0 => 1}), + 8 = maps:size(M1), + 1 = maps:get(0,M1), + ok. + t_pdict(_Config) -> put(#{ a => b, b => a},#{ c => d}), |