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/hipe | |
| 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/hipe')
| -rw-r--r-- | lib/hipe/cerl/erl_types.erl | 4 |
1 files changed, 2 insertions, 2 deletions
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) |