diff options
| author | Sverker Eriksson <[email protected]> | 2016-05-31 11:53:32 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-05-31 11:53:32 +0200 |
| commit | 0e40609c64538a58466de8cddf2a7f0aebaf65ef (patch) | |
| tree | c209d18d6a6fcfb9d292b42fc57405bd1ecea474 /erts | |
| parent | 8305c497ffff7ccf7cb06635a18c84b3eb3c859f (diff) | |
| parent | d319179eee6a523812c81c7ca49afb670de0b277 (diff) | |
| download | otp-0e40609c64538a58466de8cddf2a7f0aebaf65ef.tar.gz otp-0e40609c64538a58466de8cddf2a7f0aebaf65ef.tar.bz2 otp-0e40609c64538a58466de8cddf2a7f0aebaf65ef.zip | |
Merge branch 'sverker/dialyzer/erlang-halt'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/bif_SUITE.erl | 13 | ||||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 3 |
2 files changed, 12 insertions, 4 deletions
diff --git a/erts/emulator/test/bif_SUITE.erl b/erts/emulator/test/bif_SUITE.erl index ec6cb6ab72..d31399e4af 100644 --- a/erts/emulator/test/bif_SUITE.erl +++ b/erts/emulator/test/bif_SUITE.erl @@ -141,9 +141,11 @@ guard_bifs_in_erl_bif_types(_Config) -> shadow_comments(_Config) -> ensure_erl_bif_types_compiled(), + ErlangList = [{erlang,F,A} || {F,A} <- erlang:module_info(exports), + not is_operator(F,A)], List0 = erlang:system_info(snifs), - List1 = [MFA || {M,_,_}=MFA <- List0, M =/= hipe_bifs], - List = [MFA || MFA <- List1, not is_operator(MFA)], + List1 = [MFA || {M,_,_}=MFA <- List0, M =/= hipe_bifs, M =/= erlang], + List = List1 ++ ErlangList, HasTypes = [MFA || {M,F,A}=MFA <- List, erl_bif_types:is_known(M, F, A)], Path = get_code_path(), @@ -253,12 +255,15 @@ specs(_) -> end. is_operator({erlang,F,A}) -> + is_operator(F,A); +is_operator(_) -> false. + +is_operator(F,A) -> erl_internal:arith_op(F, A) orelse erl_internal:bool_op(F, A) orelse erl_internal:comp_op(F, A) orelse erl_internal:list_op(F, A) orelse - erl_internal:send_op(F, A); -is_operator(_) -> false. + erl_internal:send_op(F, A). extract_specs(M, Abstr) -> [{make_mfa(M, Name),Spec} || {attribute,_,spec,{Name,Spec}} <- Abstr]. diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 5283519c0a..94f3078173 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -977,11 +977,13 @@ group_leader(_GroupLeader, _Pid) -> erlang:nif_error(undefined). %% halt/0 +%% Shadowed by erl_bif_types: erlang:halt/0 -spec halt() -> no_return(). halt() -> erlang:halt(0, []). %% halt/1 +%% Shadowed by erl_bif_types: erlang:halt/1 -spec halt(Status) -> no_return() when Status :: non_neg_integer() | 'abort' | string(). halt(Status) -> @@ -2576,6 +2578,7 @@ universaltime_to_localtime(_Universaltime) -> %%-------------------------------------------------------------------------- +%% Shadowed by erl_bif_types: erlang:apply/2 -spec apply(Fun, Args) -> term() when Fun :: function(), Args :: [term()]. |