From d319179eee6a523812c81c7ca49afb670de0b277 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Mon, 30 May 2016 17:20:54 +0200
Subject: 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.
---
 erts/emulator/test/bif_SUITE.erl | 13 +++++++++----
 erts/preloaded/src/erlang.erl    |  3 +++
 lib/hipe/cerl/erl_bif_types.erl  |  6 ++++++
 3 files changed, 18 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()].
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()]))];
-- 
cgit v1.2.3