aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-05-31 11:53:32 +0200
committerSverker Eriksson <[email protected]>2016-05-31 11:53:32 +0200
commit0e40609c64538a58466de8cddf2a7f0aebaf65ef (patch)
treec209d18d6a6fcfb9d292b42fc57405bd1ecea474 /lib
parent8305c497ffff7ccf7cb06635a18c84b3eb3c859f (diff)
parentd319179eee6a523812c81c7ca49afb670de0b277 (diff)
downloadotp-0e40609c64538a58466de8cddf2a7f0aebaf65ef.tar.gz
otp-0e40609c64538a58466de8cddf2a7f0aebaf65ef.tar.bz2
otp-0e40609c64538a58466de8cddf2a7f0aebaf65ef.zip
Merge branch 'sverker/dialyzer/erlang-halt'
Diffstat (limited to 'lib')
-rw-r--r--lib/hipe/cerl/erl_bif_types.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index f649c6e599..9453ca6c6f 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -154,6 +154,8 @@ type(M, F, A, Xs) ->
erl_types:erl_type().
%%-- erlang -------------------------------------------------------------------
+type(erlang, halt, 0, _, _) -> t_none();
+type(erlang, halt, 1, _, _) -> t_none();
type(erlang, halt, 2, _, _) -> t_none();
type(erlang, exit, 1, _, _) -> t_none();
type(erlang, error, 1, _, _) -> t_none();
@@ -2339,6 +2341,10 @@ arg_types(erlang, bit_size, 1) ->
%% Guard bif, needs to be here.
arg_types(erlang, byte_size, 1) ->
[t_bitstr()];
+arg_types(erlang, halt, 0) ->
+ [];
+arg_types(erlang, halt, 1) ->
+ [t_sup([t_non_neg_fixnum(), t_atom('abort'), t_string()])];
arg_types(erlang, halt, 2) ->
[t_sup([t_non_neg_fixnum(), t_atom('abort'), t_string()]),
t_list(t_tuple([t_atom('flush'), t_boolean()]))];