diff options
| author | Raimo Niskanen <[email protected]> | 2012-03-19 10:55:31 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2012-03-21 11:00:49 +0100 |
| commit | b80ee2bbf4c2c28ceeb3e561fddc9020c686071f (patch) | |
| tree | a78f54a1336018a624d04dc2ea62fabedbe99f93 /lib/hipe | |
| parent | 83d38d0dda488ecb7090f3070a5b2569be5a555e (diff) | |
| download | otp-b80ee2bbf4c2c28ceeb3e561fddc9020c686071f.tar.gz otp-b80ee2bbf4c2c28ceeb3e561fddc9020c686071f.tar.bz2 otp-b80ee2bbf4c2c28ceeb3e561fddc9020c686071f.zip | |
erts: Implement erlang:halt/2
Diffstat (limited to 'lib/hipe')
| -rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index 845df0ca61..a7ce17eb53 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-2011. All Rights Reserved. +%% Copyright Ericsson AB 2003-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -241,6 +241,7 @@ type(erl_ddll, try_unload, 2, Xs) -> %%-- 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(); %% Note that exit/2 sends an exit signal to another process. type(erlang, exit, 2, _) -> t_atom('true'); @@ -3553,7 +3554,10 @@ arg_types(erlang, group_leader, 2) -> arg_types(erlang, halt, 0) -> []; arg_types(erlang, halt, 1) -> - [t_sup(t_non_neg_fixnum(), t_string())]; + [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()]))]; arg_types(erlang, hash, 2) -> [t_any(), t_integer()]; arg_types(erlang, hd, 1) -> |