diff options
author | Hans Bolinder <[email protected]> | 2017-06-14 08:32:24 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2017-06-14 08:32:24 +0200 |
commit | d4fea060349a72fb58267e82c2d6bfa7b638b2c9 (patch) | |
tree | 55d6132b053943890bc1314df49c88cede3476e6 /lib/dialyzer/src/dialyzer_cl.erl | |
parent | ae27396d10508b21d1de6a7d347b98f3259fa507 (diff) | |
parent | 3f185989845ab0324b8a96988066b644d15ab791 (diff) | |
download | otp-d4fea060349a72fb58267e82c2d6bfa7b638b2c9.tar.gz otp-d4fea060349a72fb58267e82c2d6bfa7b638b2c9.tar.bz2 otp-d4fea060349a72fb58267e82c2d6bfa7b638b2c9.zip |
Merge branch 'hasse/dialyzer/opt/OTP-14218'
* hasse/dialyzer/opt/OTP-14218:
dialyzer: Run more of analyses in subprocess
dialyzer: Do not use two records for PLTs
dialyzer: Improve compression of an ETS table
dialyzer: Minor optimizations
hipe: Remove 'undefined' from a record field's type
dialyzer: Warn about unused unknown types
hipe: Remove use of 'catch'
dialyzer: Correct a mistake
dialyzer: Rearrange some code to save memory
dialyzer: Optimize by avoiding some table lookups
hipe: Optimize contract decoration somewhat
hipe: Correct a typespec
Diffstat (limited to 'lib/dialyzer/src/dialyzer_cl.erl')
-rw-r--r-- | lib/dialyzer/src/dialyzer_cl.erl | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl index d72ae1dc86..0617be6435 100644 --- a/lib/dialyzer/src/dialyzer_cl.erl +++ b/lib/dialyzer/src/dialyzer_cl.erl @@ -637,8 +637,8 @@ cl_loop(State, LogCache) -> {BackendPid, cserver, CodeServer, _Plt} -> % Plt is ignored NewState = State#cl_state{code_server = CodeServer}, cl_loop(NewState, LogCache); - {BackendPid, done, NewMiniPlt, _NewDocPlt} -> - return_value(State, NewMiniPlt); + {BackendPid, done, NewPlt, _NewDocPlt} -> + return_value(State, NewPlt); {BackendPid, ext_calls, ExtCalls} -> cl_loop(State#cl_state{external_calls = ExtCalls}, LogCache); {BackendPid, ext_types, ExtTypes} -> @@ -700,7 +700,7 @@ return_value(State = #cl_state{code_server = CodeServer, output_plt = OutputPlt, plt_info = PltInfo, stored_warnings = StoredWarnings}, - MiniPlt) -> + Plt) -> %% Just for now: case CodeServer =:= none of true -> @@ -710,18 +710,9 @@ return_value(State = #cl_state{code_server = CodeServer, end, case OutputPlt =:= none of true -> - dialyzer_plt:delete(MiniPlt); + dialyzer_plt:delete(Plt); false -> - Fun = to_file_fun(OutputPlt, MiniPlt, ModDeps, PltInfo), - {Pid, Ref} = erlang:spawn_monitor(Fun), - dialyzer_plt:give_away(MiniPlt, Pid), - Pid ! go, - receive {'DOWN', Ref, process, Pid, Result} -> - case Result of - ok -> ok; - Thrown -> throw(Thrown) - end - end + dialyzer_plt:to_file(OutputPlt, Plt, ModDeps, PltInfo) end, UnknownWarnings = unknown_warnings(State), RetValue = @@ -742,16 +733,6 @@ return_value(State = #cl_state{code_server = CodeServer, {RetValue, set_warning_id(AllWarnings)} end. --spec to_file_fun(_, _, _, _) -> fun(() -> no_return()). - -to_file_fun(Filename, MiniPlt, ModDeps, PltInfo) -> - fun() -> - receive go -> ok end, - Plt = dialyzer_plt:restore_full_plt(MiniPlt), - dialyzer_plt:to_file(Filename, Plt, ModDeps, PltInfo), - exit(ok) - end. - unknown_warnings(State = #cl_state{legal_warnings = LegalWarnings}) -> Unknown = case ordsets:is_element(?WARN_UNKNOWN, LegalWarnings) of true -> |