Merge branch 'maint'

* maint:
  dialyzer: Increase time limit of suites
  dialyzer: Remove a check that always fails
  dialyzer: Optimize an opaque type case

4 files changed, 5 insertions, 13 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}.
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 243bb6e25d..c9dd1051f3 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -4749,7 +4749,7 @@ type_from_form1(Name, Args, ArgsLen, R, TypeName, TypeNames, S, D, L, C) ->
                 {Rep, L2, C2} = recur_limit(Fun, D, L1, TypeName, TypeNames),
                 Rep1 = choose_opaque_type(Rep, Type),
                 Rep2 = case cannot_have_opaque(Rep1, TypeName, TypeNames) of
-                         true -> Rep1;
+                         true -> Rep;
                          false ->
                            ArgTypes2 = subst_all_vars_to_any_list(ArgTypes),
                            t_opaque(Module, Name, ArgTypes2, Rep1)
@@ -4821,7 +4821,7 @@ remote_from_form1(RemMod, Name, Args, ArgsLen, RemDict, RemType, TypeNames,
                 NewRep1 = choose_opaque_type(NewRep, Type),
                 NewRep2 =
                   case cannot_have_opaque(NewRep1, RemType, TypeNames) of
-                    true -> NewRep1;
+                    true -> NewRep;
                     false ->
                       ArgTypes2 = subst_all_vars_to_any_list(ArgTypes),
                       t_opaque(Mod, Name, ArgTypes2, NewRep1)