aboutsummaryrefslogtreecommitdiffstats
path: root/lib/hipe
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2016-02-10 08:37:41 +0100
committerHans Bolinder <[email protected]>2016-02-10 08:37:41 +0100
commitbaf313fb8b603bb249ed1c30207ceb47aa52aff9 (patch)
tree7fe6ca3275d5fe40a74b898e588ec6a87ce4ee20 /lib/hipe
parent8edd580904f284123a56547efc5b43d5d35664e3 (diff)
parent439292ad4afe73243852fe79d5d467c325f382bf (diff)
downloadotp-baf313fb8b603bb249ed1c30207ceb47aa52aff9.tar.gz
otp-baf313fb8b603bb249ed1c30207ceb47aa52aff9.tar.bz2
otp-baf313fb8b603bb249ed1c30207ceb47aa52aff9.zip
Merge branch 'maint'
* maint: dialyzer: Correct byte_size() and comparisons Conflicts: lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'lib/hipe')
-rw-r--r--lib/hipe/cerl/erl_bif_types.erl6
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 e36643e090..7684dc4a81 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2003-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -2148,7 +2148,7 @@ type_ranks(Type, I, Min, Max, [TypeClass|Rest], Opaques) ->
type_order() ->
[t_number(), t_atom(), t_reference(), t_fun(), t_port(), t_pid(), t_tuple(),
- t_list(), t_binary()].
+ t_map(), t_list(), t_bitstr()].
key_comparisons_fail(X0, KeyPos, TupleList, Opaques) ->
X = case t_is_number(t_inf(X0, t_number(), Opaques), Opaques) of
@@ -2248,7 +2248,7 @@ arg_types(erlang, bit_size, 1) ->
[t_bitstr()];
%% Guard bif, needs to be here.
arg_types(erlang, byte_size, 1) ->
- [t_binary()];
+ [t_bitstr()];
arg_types(erlang, halt, 0) ->
[];
arg_types(erlang, halt, 1) ->