typer: Fix a bug regarding the -T option

The -T option has not been working for a long time.

4 files changed, 14 insertions, 15 deletions

diff --git a/lib/dialyzer/src/dialyzer_codeserver.erl b/lib/dialyzer/src/dialyzer_codeserver.erl
index aa779e0e39..e15569388e 100644
--- a/lib/dialyzer/src/dialyzer_codeserver.erl
+++ b/lib/dialyzer/src/dialyzer_codeserver.erl
@@ -72,7 +72,6 @@
 -type mod_records()   :: erl_types:mod_records().
 
 -type contracts()     :: #{mfa() => dialyzer_contracts:file_contract()}.
--type mod_contracts() :: dict:dict(module(), contracts()).
 
 %% A property-list of data compiled from -compile and -dialyzer attributes.
 -type meta_info()     :: [{{'nowarn_function' | dial_warn_tag()},
@@ -346,10 +345,13 @@ lookup_meta_info(MorMFA, #codeserver{fun_meta_info = FunMetaInfo}) ->
     {ok, PropList} -> PropList
   end.
 
--spec get_contracts(codeserver()) -> mod_contracts().
+-spec get_contracts(codeserver()) ->
+                       dict:dict(mfa(), dialyzer_contracts:file_contract()).
 
 get_contracts(#codeserver{contracts = ContDict}) ->
-  ets_dict_to_dict(ContDict).
+  dict:filter(fun({_M, _F, _A}, _) -> true;
+                 (_, _) -> false
+              end, ets_dict_to_dict(ContDict)).
 
 -spec get_callbacks(codeserver()) -> list().
 
diff --git a/lib/dialyzer/src/dialyzer_contracts.erl b/lib/dialyzer/src/dialyzer_contracts.erl
index 45f9099f4e..5f24b5a668 100644
--- a/lib/dialyzer/src/dialyzer_contracts.erl
+++ b/lib/dialyzer/src/dialyzer_contracts.erl
@@ -177,7 +177,7 @@ process_contract_remote_types(CodeServer) ->
 
 -type fun_types() :: dict:dict(label(), erl_types:type_table()).
 
--spec check_contracts([{mfa(), file_contract()}],
+-spec check_contracts(orddict:orddict(mfa(), file_contract()),
 		      dialyzer_callgraph:callgraph(), fun_types(),
                       opaques_fun()) -> plt_contracts().
 
@@ -206,7 +206,7 @@ check_contracts(Contracts, Callgraph, FunTypes, FindOpaques) ->
 	  error -> NewContracts
 	end
     end,
-  dict:fold(FoldFun, [], FunTypes).
+  orddict:from_list(dict:fold(FoldFun, [], FunTypes)).
 
 %% Checks all components of a contract
 -spec check_contract(#contract{}, erl_types:erl_type()) -> 'ok' | {'error', term()}.
diff --git a/lib/dialyzer/src/dialyzer_plt.erl b/lib/dialyzer/src/dialyzer_plt.erl
index 1bf30cf83b..511a17d577 100644
--- a/lib/dialyzer/src/dialyzer_plt.erl
+++ b/lib/dialyzer/src/dialyzer_plt.erl
@@ -144,6 +144,10 @@ delete_list(#plt{info = Info, types = Types,
 
 -spec insert_contract_list(plt(), dialyzer_contracts:plt_contracts()) -> plt().
 
+insert_contract_list(#plt{contracts = Contracts} = PLT, List) ->
+  NewContracts = dict:merge(fun(_MFA, _Old, New) -> New end,
+                            Contracts, dict:from_list(List)),
+  PLT#plt{contracts = NewContracts};
 insert_contract_list(#mini_plt{contracts = Contracts} = PLT, List) ->
   true = ets:insert(Contracts, List),
   PLT.
diff --git a/lib/typer/src/typer.erl b/lib/typer/src/typer.erl
index 584c8001f1..18c4fe902d 100644
--- a/lib/typer/src/typer.erl
+++ b/lib/typer/src/typer.erl
@@ -142,16 +142,9 @@ extract(#analysis{macros = Macros,
 	compile_error(ErrorMsg)
     end,
   %% Create TrustPLT
-  Contracts = dialyzer_codeserver:get_contracts(NewCodeServer),
-  Modules = dict:fetch_keys(Contracts),
-  FoldFun =
-    fun(Module, TmpPlt) ->
-	{ok, ModuleContracts} = dict:find(Module, Contracts),
-	SpecList = [{MFA, Contract} 
-		    || {MFA, {_FileLine, Contract}} <- maps:to_list(ModuleContracts)],
-	dialyzer_plt:insert_contract_list(TmpPlt, SpecList)
-    end,
-  NewTrustPLT = lists:foldl(FoldFun, TrustPLT, Modules),
+  ContractsDict = dialyzer_codeserver:get_contracts(NewCodeServer),
+  Contracts = orddict:from_list(dict:to_list(ContractsDict)),
+  NewTrustPLT = dialyzer_plt:insert_contract_list(TrustPLT, Contracts),
   Analysis#analysis{trust_plt = NewTrustPLT}.
 
 %%--------------------------------------------------------------------