Merge branch 'sa/dialyzer-fix-r15b02' into maint

* sa/dialyzer-fix-r15b02:
  Fix a crash in race condition detection
  Remove old untested experimental extension
  Respect {plt_check,false} option when using dialyzer:run/1
  Fix handling of tuple set remote types appearing in tuple sets

OTP-10464

1 files changed, 2 insertions, 104 deletions

diff --git a/lib/dialyzer/src/dialyzer_behaviours.erl b/lib/dialyzer/src/dialyzer_behaviours.erl
index b84071b95c..36aef2a37f 100644
--- a/lib/dialyzer/src/dialyzer_behaviours.erl
+++ b/lib/dialyzer/src/dialyzer_behaviours.erl
@@ -30,11 +30,9 @@
 
 -module(dialyzer_behaviours).
 
--export([check_callbacks/5, get_behaviour_apis/1,
-	 translate_behaviour_api_call/5, translatable_behaviours/1,
-	 translate_callgraph/3]).
+-export([check_callbacks/5]).
 
--export_type([behaviour/0, behaviour_api_dict/0]).
+-export_type([behaviour/0]).
 
 %%--------------------------------------------------------------------
 
@@ -224,103 +222,3 @@ get_line([]) -> -1.
 
 get_file([{file, File}|_]) -> File;
 get_file([_|Tail]) -> get_file(Tail).
-
-%%-----------------------------------------------------------------------------
-
--spec translatable_behaviours(cerl:c_module()) -> behaviour_api_dict().
-
-translatable_behaviours(Tree) ->
-  Attrs = cerl:module_attrs(Tree),
-  {Behaviours, _BehLines} = get_behaviours(Attrs),
-  [{B, Calls} || B <- Behaviours, (Calls = behaviour_api_calls(B)) =/= []].
-
--spec get_behaviour_apis([behaviour()]) -> [mfa()].
-
-get_behaviour_apis(Behaviours) ->
-  get_behaviour_apis(Behaviours, []).
-
--spec translate_behaviour_api_call(dialyzer_callgraph:mfa_or_funlbl(),
-				   [erl_types:erl_type()],
-				   [dialyzer_races:core_vars()],
-				   module(),
-				   behaviour_api_dict()) ->
-				      {dialyzer_callgraph:mfa_or_funlbl(),
-				       [erl_types:erl_type()],
-				       [dialyzer_races:core_vars()]}
-					| 'plain_call'.
-
-translate_behaviour_api_call(_Fun, _ArgTypes, _Args, _Module, []) ->
-  plain_call;
-translate_behaviour_api_call({Module, Fun, Arity}, ArgTypes, Args,
-			     CallbackModule, BehApiInfo) ->
-  case lists:keyfind(Module, 1, BehApiInfo) of
-    false -> plain_call;
-    {Module, Calls} ->
-      case lists:keyfind({Fun, Arity}, 1, Calls) of
-	false -> plain_call;
-	{{Fun, Arity}, {CFun, CArity, COrder}} ->
-	  {{CallbackModule, CFun, CArity},
-	   [nth_or_0(N, ArgTypes, erl_types:t_any()) || N <-COrder],
-	   [nth_or_0(N, Args, bypassed) || N <-COrder]}
-      end
-  end;
-translate_behaviour_api_call(_Fun, _ArgTypes, _Args, _Module, _BehApiInfo) ->
-  plain_call.
-
--spec translate_callgraph(behaviour_api_dict(), atom(),
-			  dialyzer_callgraph:callgraph()) ->
-			     dialyzer_callgraph:callgraph().
-
-translate_callgraph([{Behaviour,_}|Behaviours], Module, Callgraph) ->
-  UsedCalls = [Call || {_From, {M, _F, _A}} = Call <-
-			 dialyzer_callgraph:get_behaviour_api_calls(Callgraph),
-		       M =:= Behaviour],
-  Calls = [{{Behaviour, API, Arity}, Callback} ||
-	    {{API, Arity}, Callback} <- behaviour_api_calls(Behaviour)],
-  DirectCalls = [{From, {Module, Fun, Arity}} ||
-		  {From, To} <- UsedCalls,{API, {Fun, Arity, _Ord}} <- Calls,
-		  To =:= API],
-  dialyzer_callgraph:add_edges(DirectCalls, Callgraph),
-  translate_callgraph(Behaviours, Module, Callgraph);
-translate_callgraph([], _Module, Callgraph) ->
-  Callgraph.
-
-get_behaviour_apis([], Acc) ->
-  Acc;
-get_behaviour_apis([Behaviour | Rest], Acc) ->
-  MFAs = [{Behaviour, Fun, Arity} ||
-	   {{Fun, Arity}, _} <- behaviour_api_calls(Behaviour)],
-  get_behaviour_apis(Rest, MFAs ++ Acc).
-
-%------------------------------------------------------------------------------
-
-nth_or_0(0, _List, Zero) ->
-  Zero;
-nth_or_0(N, List, _Zero) ->
-  lists:nth(N, List).
-
-%------------------------------------------------------------------------------
-
--type behaviour_api_dict()::[{behaviour(), behaviour_api_info()}].
--type behaviour_api_info()::[{original_fun(), replacement_fun()}].
--type original_fun()::{atom(), arity()}.
--type replacement_fun()::{atom(), arity(), arg_list()}.
--type arg_list()::[byte()].
-
--spec behaviour_api_calls(behaviour()) -> behaviour_api_info().
-
-behaviour_api_calls(gen_server) ->
-  [{{start_link, 3}, {init, 1, [2]}},
-   {{start_link, 4}, {init, 1, [3]}},
-   {{start, 3}, {init, 1, [2]}},
-   {{start, 4}, {init, 1, [3]}},
-   {{call, 2}, {handle_call, 3, [2, 0, 0]}},
-   {{call, 3}, {handle_call, 3, [2, 0, 0]}},
-   {{multi_call, 2}, {handle_call, 3, [2, 0, 0]}},
-   {{multi_call, 3}, {handle_call, 3, [3, 0, 0]}},
-   {{multi_call, 4}, {handle_call, 3, [3, 0, 0]}},
-   {{cast, 2}, {handle_cast, 2, [2, 0]}},
-   {{abcast, 2}, {handle_cast, 2, [2, 0]}},
-   {{abcast, 3}, {handle_cast, 2, [3, 0]}}];
-behaviour_api_calls(_Other) ->
-  [].