diff options
| author | Hans Bolinder <[email protected]> | 2018-01-19 12:46:08 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2018-01-19 12:46:08 +0100 |
| commit | e6432a0c60a488c7750fcdab3a4f2821c0f35ec8 (patch) | |
| tree | 90ef7ba9e8e5099ce0de015ae98c630760bc554d | |
| parent | 9ff28ca4095c7877f4f4a6cab4d691ba52f07372 (diff) | |
| parent | 69de63049417cf7e047f035b5e086caad9dc7932 (diff) | |
| download | otp-e6432a0c60a488c7750fcdab3a4f2821c0f35ec8.tar.gz otp-e6432a0c60a488c7750fcdab3a4f2821c0f35ec8.tar.bz2 otp-e6432a0c60a488c7750fcdab3a4f2821c0f35ec8.zip | |
Merge branch 'maint'
* maint:
dialyzer: Fix bsl/2 bug
| -rw-r--r-- | lib/dialyzer/test/small_SUITE_data/src/bsL.erl | 13 | ||||
| -rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 3 | ||||
| -rw-r--r-- | lib/hipe/cerl/erl_types.erl | 4 |
3 files changed, 19 insertions, 1 deletions
diff --git a/lib/dialyzer/test/small_SUITE_data/src/bsL.erl b/lib/dialyzer/test/small_SUITE_data/src/bsL.erl new file mode 100644 index 0000000000..b2fdc16324 --- /dev/null +++ b/lib/dialyzer/test/small_SUITE_data/src/bsL.erl @@ -0,0 +1,13 @@ +-module(bsL). + +-export([t/0]). + +%% Found in lib/observer/test/crashdump_helper.erl. + +t() -> + Size = 60, + <<H:16/unit:8>> = erlang:md5(<<Size:32>>), + true = H < 20, + true = H > 2, + Data = ((H bsl (8*150)) div (H+7919)), + <<Data:Size/unit:8>>. diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index fc6a844e22..5fda857bf1 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -1885,7 +1885,8 @@ infinity_div(Number1, Number2) when is_integer(Number1), is_integer(Number2) -> infinity_bsl(pos_inf, _) -> pos_inf; infinity_bsl(neg_inf, _) -> neg_inf; -infinity_bsl(Number, pos_inf) when is_integer(Number), Number >= 0 -> pos_inf; +infinity_bsl(0, pos_inf) -> 0; +infinity_bsl(Number, pos_inf) when is_integer(Number), Number > 0 -> pos_inf; infinity_bsl(Number, pos_inf) when is_integer(Number) -> neg_inf; infinity_bsl(Number, neg_inf) when is_integer(Number), Number >= 0 -> 0; infinity_bsl(Number, neg_inf) when is_integer(Number) -> -1; diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl index 77a2a7401c..8a609ef911 100644 --- a/lib/hipe/cerl/erl_types.erl +++ b/lib/hipe/cerl/erl_types.erl @@ -2351,6 +2351,8 @@ t_from_range(X, Y) -> -else. +t_from_range(pos_inf, pos_inf) -> ?integer_pos; +t_from_range(neg_inf, neg_inf) -> ?integer_neg; t_from_range(neg_inf, pos_inf) -> t_integer(); t_from_range(neg_inf, Y) when is_integer(Y), Y < 0 -> ?integer_neg; t_from_range(neg_inf, Y) when is_integer(Y), Y >= 0 -> t_integer(); @@ -2383,6 +2385,8 @@ t_from_range(pos_inf, neg_inf) -> t_none(). -spec t_from_range_unsafe(rng_elem(), rng_elem()) -> erl_type(). +t_from_range_unsafe(pos_inf, pos_inf) -> ?integer_pos; +t_from_range_unsafe(neg_inf, neg_inf) -> ?integer_neg; t_from_range_unsafe(neg_inf, pos_inf) -> t_integer(); t_from_range_unsafe(neg_inf, Y) -> ?int_range(neg_inf, Y); t_from_range_unsafe(X, pos_inf) -> ?int_range(X, pos_inf); |