aboutsummaryrefslogtreecommitdiffstats
path: root/lib/dialyzer/src
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2014-08-21 08:59:57 +0200
committerHans Bolinder <[email protected]>2014-08-21 08:59:57 +0200
commit0f0befab60ccd0bb75972932299a2b4c0522325a (patch)
treef3e93f6bdb0af221e40dd18df2db5489ac7e8588 /lib/dialyzer/src
parent69fbb4bd0466931882cc275b1ecb1f81fee97f0d (diff)
parentdaed987f7ebae3fc8f969b4f55f225837267411b (diff)
downloadotp-0f0befab60ccd0bb75972932299a2b4c0522325a.tar.gz
otp-0f0befab60ccd0bb75972932299a2b4c0522325a.tar.bz2
otp-0f0befab60ccd0bb75972932299a2b4c0522325a.zip
Merge branch 'maint'
* maint: dialyzer: fix a -Wunderspecs bug
Diffstat (limited to 'lib/dialyzer/src')
-rw-r--r--lib/dialyzer/src/dialyzer_contracts.erl7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/dialyzer/src/dialyzer_contracts.erl b/lib/dialyzer/src/dialyzer_contracts.erl
index 3aa5a1779c..ee147ca102 100644
--- a/lib/dialyzer/src/dialyzer_contracts.erl
+++ b/lib/dialyzer/src/dialyzer_contracts.erl
@@ -20,8 +20,6 @@
-module(dialyzer_contracts).
--compile(export_all).
-
-export([check_contract/2,
check_contracts/4,
contracts_without_fun/3,
@@ -688,7 +686,7 @@ picky_contract_check(CSig0, Sig0, MFA, FileLine, Contract, RecDict, Acc) ->
true -> Acc;
false ->
case extra_contract_warning(MFA, FileLine, Contract,
- CSig, Sig, RecDict) of
+ CSig0, Sig0, RecDict) of
no_warning -> Acc;
{warning, Warning} -> [Warning|Acc]
end
@@ -754,7 +752,8 @@ is_remote_types_related(Contract, CSig, Sig, RecDict) ->
t_from_forms_without_remote([{FType, []}], RecDict) ->
Type0 = erl_types:t_from_form(FType, RecDict),
- {ok, erl_types:subst_all_remote(Type0, erl_types:t_none())};
+ Type1 = erl_types:subst_all_remote(Type0, erl_types:t_none()),
+ {ok, erl_types:subst_all_vars_to_any(Type1)};
t_from_forms_without_remote([{_FType, _Constrs}], _RecDict) ->
%% 'When' constraints
unsupported;