diff options
| author | Hans Bolinder <[email protected]> | 2016-09-01 08:30:38 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-09-01 08:30:38 +0200 |
| commit | 60b407f0db64065e61915cd17c9f0175fa86b7e1 (patch) | |
| tree | c062fdb56aa95c196e1f5d172fd7e0e0b2018e6b /lib/dialyzer | |
| parent | 27cd15570cc45388cae5ec710f663e571c920c0c (diff) | |
| parent | 5fb3092abd47779a6e5847a6c193ab103fe5bb06 (diff) | |
| download | otp-60b407f0db64065e61915cd17c9f0175fa86b7e1.tar.gz otp-60b407f0db64065e61915cd17c9f0175fa86b7e1.tar.bz2 otp-60b407f0db64065e61915cd17c9f0175fa86b7e1.zip | |
Merge branch 'maint'
* maint:
dialyzer: Increase time limit of suites
dialyzer: Remove a check that always fails
dialyzer: Optimize an opaque type case
Diffstat (limited to 'lib/dialyzer')
| -rw-r--r-- | lib/dialyzer/src/dialyzer_contracts.erl | 12 | ||||
| -rw-r--r-- | lib/dialyzer/test/behaviour_SUITE_data/dialyzer_options | 1 | ||||
| -rw-r--r-- | lib/dialyzer/test/opaque_SUITE_data/dialyzer_options | 1 |
3 files changed, 3 insertions, 11 deletions
diff --git a/lib/dialyzer/src/dialyzer_contracts.erl b/lib/dialyzer/src/dialyzer_contracts.erl index 976a2b8955..a72368f9f8 100644 --- a/lib/dialyzer/src/dialyzer_contracts.erl +++ b/lib/dialyzer/src/dialyzer_contracts.erl @@ -768,19 +768,9 @@ picky_contract_check(CSig0, Sig0, MFA, WarningInfo, Contract, RecDict, Acc) -> end. extra_contract_warning(MFA, WarningInfo, Contract, CSig, Sig, RecDict) -> - %% We do not want to depend upon erl_types:t_to_string() possibly - %% hiding the contents of opaque types. - SigUnopaque = erl_types:t_unopaque(Sig), - CSigUnopaque = erl_types:t_unopaque(CSig), - SigString0 = - lists:flatten(dialyzer_utils:format_sig(SigUnopaque, RecDict)), - ContractString0 = - lists:flatten(dialyzer_utils:format_sig(CSigUnopaque, RecDict)), - %% The only difference is in record fields containing 'undefined' or not. - IsUndefRecordFieldsRelated = SigString0 =:= ContractString0, {IsRemoteTypesRelated, SubtypeRelation} = is_remote_types_related(Contract, CSig, Sig, MFA, RecDict), - case IsUndefRecordFieldsRelated orelse IsRemoteTypesRelated of + case IsRemoteTypesRelated of true -> no_warning; false -> diff --git a/lib/dialyzer/test/behaviour_SUITE_data/dialyzer_options b/lib/dialyzer/test/behaviour_SUITE_data/dialyzer_options index 50991c9bc5..cb6a88786e 100644 --- a/lib/dialyzer/test/behaviour_SUITE_data/dialyzer_options +++ b/lib/dialyzer/test/behaviour_SUITE_data/dialyzer_options @@ -1 +1,2 @@ {dialyzer_options, []}. +{time_limit, 2}. diff --git a/lib/dialyzer/test/opaque_SUITE_data/dialyzer_options b/lib/dialyzer/test/opaque_SUITE_data/dialyzer_options index 3ff26b87db..ffdf8270c8 100644 --- a/lib/dialyzer/test/opaque_SUITE_data/dialyzer_options +++ b/lib/dialyzer/test/opaque_SUITE_data/dialyzer_options @@ -1 +1,2 @@ {dialyzer_options, [{warnings, [no_unused, no_return]}]}. +{time_limit, 2}. |