aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-05-30 17:20:54 +0200
committerSverker Eriksson <[email protected]>2016-05-30 17:21:50 +0200
commitd319179eee6a523812c81c7ca49afb670de0b277 (patch)
treed8baec1897320ca8ce3d58b51915613f552b6328 /erts/preloaded
parentbf46ff0561ee64cc99f30da30a52ca5268af134e (diff)
downloadotp-d319179eee6a523812c81c7ca49afb670de0b277.tar.gz
otp-d319179eee6a523812c81c7ca49afb670de0b277.tar.bz2
otp-d319179eee6a523812c81c7ca49afb670de0b277.zip
Reintroduce erlang:halt/0/1 in erl_bif_types.erl
Removed in f9cb80861f169743 when changed impl from C to Erlang. But seems they are needed to keep dialyzer tests happy. Also improved bif_SUITE:shadow_comments to include all exported in module erlang, not just the "snifs". ...which detected that apply/2 was missing Shadowed comment as well.
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/src/erlang.erl3
1 files changed, 3 insertions, 0 deletions
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()].