diff options
| author | Sverker Eriksson <[email protected]> | 2016-05-27 15:27:19 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-05-27 15:27:19 +0200 |
| commit | 23b38b4409d52eeb42d87202c49867295b066c47 (patch) | |
| tree | 6aebd99b44200341c5a17f45ea1d2fbf42187773 /lib/hipe | |
| parent | af9e26bc0cdbbd1a5a81e760501c307c3176fea0 (diff) | |
| parent | 0f8fab10dad03273b75f205bd9fae746d2077829 (diff) | |
| download | otp-23b38b4409d52eeb42d87202c49867295b066c47.tar.gz otp-23b38b4409d52eeb42d87202c49867295b066c47.tar.bz2 otp-23b38b4409d52eeb42d87202c49867295b066c47.zip | |
Merge branch 'richcarl/erts/fix-init-stop/PR-911/OTP-13630/OTP-13631'
Diffstat (limited to 'lib/hipe')
| -rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 6 | ||||
| -rw-r--r-- | lib/hipe/icode/hipe_icode_type.erl | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index 9453ca6c6f..f649c6e599 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -154,8 +154,6 @@ 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(); @@ -2341,10 +2339,6 @@ 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()]))]; diff --git a/lib/hipe/icode/hipe_icode_type.erl b/lib/hipe/icode/hipe_icode_type.erl index e3ba00c5e9..5eae8d440a 100644 --- a/lib/hipe/icode/hipe_icode_type.erl +++ b/lib/hipe/icode/hipe_icode_type.erl @@ -363,6 +363,7 @@ call_always_fails(#icode_call{} = I, Info) -> %% These can actually be calls too. {erlang, halt, 0} -> false; {erlang, halt, 1} -> false; + {erlang, halt, 2} -> false; {erlang, exit, 1} -> false; {erlang, error, 1} -> false; {erlang, error, 2} -> false; |