From e21f6ea9d28b0e8ed9609338499daaab306fa439 Mon Sep 17 00:00:00 2001 From: Stavros Aronis Date: Mon, 27 Feb 2012 21:41:01 +0100 Subject: Plain concatenation for typesig not-fixpoint list --- lib/dialyzer/src/dialyzer_coordinator.erl | 2 +- lib/dialyzer/src/dialyzer_succ_typings.erl | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/dialyzer/src/dialyzer_coordinator.erl b/lib/dialyzer/src/dialyzer_coordinator.erl index 91a0dd662d..24bc38616c 100644 --- a/lib/dialyzer/src/dialyzer_coordinator.erl +++ b/lib/dialyzer/src/dialyzer_coordinator.erl @@ -260,7 +260,7 @@ handle_cast({done, Job, NewData}, case Mode of X when X =:= 'typesig'; X =:= 'dataflow' -> FinalData = dialyzer_succ_typings:lookup_names(NewData, Servers), - ordsets:union(OldResult, FinalData); + FinalData ++ OldResult; 'compile' -> dialyzer_analysis_callgraph:add_to_result(Job, NewData, OldResult); 'warnings' -> diff --git a/lib/dialyzer/src/dialyzer_succ_typings.erl b/lib/dialyzer/src/dialyzer_succ_typings.erl index 2856a26169..ff4102f5a3 100644 --- a/lib/dialyzer/src/dialyzer_succ_typings.erl +++ b/lib/dialyzer/src/dialyzer_succ_typings.erl @@ -258,12 +258,11 @@ refine_one_module(M, {CodeServer, Callgraph, Plt}) -> NewFunTypes = dialyzer_dataflow:get_fun_types(ModCode, Plt, Callgraph, Records), case reached_fixpoint(FunTypes, NewFunTypes) of - true -> - ordsets:new(); + true -> []; {false, NotFixpoint} -> ?debug("Not fixpoint\n", []), Plt = insert_into_plt(dict:from_list(NotFixpoint), Callgraph, Plt), - ordsets:from_list([FunLbl || {FunLbl,_Type} <- NotFixpoint]) + [FunLbl || {FunLbl,_Type} <- NotFixpoint] end. reached_fixpoint(OldTypes, NewTypes) -> @@ -382,7 +381,7 @@ find_succ_types_for_scc(SCC, {Codeserver, Callgraph, Plt}) -> true -> []; false -> ?debug("Not fixpoint for: ~w\n", [AllFuns]), - ordsets:from_list([Fun || {Fun, _Arity} <- AllFuns]) + [Fun || {Fun, _Arity} <- AllFuns] end. get_fun_types_from_plt(FunList, Callgraph, Plt) -> -- cgit v1.2.3