aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2018-01-31 10:17:53 +0100
committerBjörn Gustavsson <[email protected]>2018-01-31 10:17:53 +0100
commit2208953ca144858ddc343721a9cc40e43cc7fe0c (patch)
tree417bda1a7c739bf8a6dfa1df1cf486ae75d99dae /lib/compiler/src
parent1fe1c9a57d365c8203cb1380e4bdfe8f7f6ab8ce (diff)
parent2e5063371ca21eeabd9c20462c16fac0ee147028 (diff)
downloadotp-2208953ca144858ddc343721a9cc40e43cc7fe0c.tar.gz
otp-2208953ca144858ddc343721a9cc40e43cc7fe0c.tar.bz2
otp-2208953ca144858ddc343721a9cc40e43cc7fe0c.zip
Merge branch 'maint'
* maint: Fix incorrect type interference of integer ranges Conflicts: lib/compiler/src/beam_type.erl
Diffstat (limited to 'lib/compiler/src')
-rw-r--r--lib/compiler/src/beam_type.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/compiler/src/beam_type.erl b/lib/compiler/src/beam_type.erl
index b2fabed2c5..a2e3af37d0 100644
--- a/lib/compiler/src/beam_type.erl
+++ b/lib/compiler/src/beam_type.erl
@@ -943,10 +943,10 @@ merge_type_info({tuple,SzKind1,Sz1,[]}, {tuple,_SzKind2,_Sz2,First}=Tuple2) ->
merge_type_info({tuple,SzKind1,Sz1,First}, Tuple2);
merge_type_info({tuple,_SzKind1,_Sz1,First}=Tuple1, {tuple,SzKind2,Sz2,_}) ->
merge_type_info(Tuple1, {tuple,SzKind2,Sz2,First});
-merge_type_info(integer, {integer,_}=Int) ->
- Int;
-merge_type_info({integer,_}=Int, integer) ->
- Int;
+merge_type_info(integer, {integer,_}) ->
+ integer;
+merge_type_info({integer,_}, integer) ->
+ integer;
merge_type_info({integer,{Min1,Max1}}, {integer,{Min2,Max2}}) ->
{integer,{max(Min1, Min2),min(Max1, Max2)}};
merge_type_info({binary,U1}, {binary,U2}) ->