aboutsummaryrefslogtreecommitdiffstats
path: root/lib/dialyzer
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2012-08-21 10:46:32 +0200
committerHans Bolinder <[email protected]>2012-08-21 10:46:32 +0200
commit064b42237d891d5fdcb6c1a351980b8291437618 (patch)
treed1156281ddb1c8af7f4273395afb704755506a05 /lib/dialyzer
parent73f042d16fc016fa6c1c3bded1b3333707fc668a (diff)
parent03689627871fce1a0aac7dad314448bb138e88ac (diff)
downloadotp-064b42237d891d5fdcb6c1a351980b8291437618.tar.gz
otp-064b42237d891d5fdcb6c1a351980b8291437618.tar.bz2
otp-064b42237d891d5fdcb6c1a351980b8291437618.zip
Merge branch 'hb/dialyzer/bug_fixes/OTP-10191' into maint
* hb/dialyzer/bug_fixes/OTP-10191: Let t_inf() substitute any() for variables in a few more cases Fix a bug in dialyzer_dataflow
Diffstat (limited to 'lib/dialyzer')
-rw-r--r--lib/dialyzer/src/dialyzer_dataflow.erl14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index cb376daf68..7131633da1 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -2468,14 +2468,18 @@ join_maps(Maps, MapOut) ->
Keys = ordsets:from_list(dict:fetch_keys(Dict) ++ dict:fetch_keys(Subst)),
join_maps(Keys, Maps, MapOut).
-join_maps([Key|Left], Maps, MapOut) ->
+join_maps(Keys, Maps, MapOut) ->
+ KTs = join_maps_collect(Keys, Maps, MapOut),
+ lists:foldl(fun({K, T}, M) -> enter_type(K, T, M) end, MapOut, KTs).
+
+join_maps_collect([Key|Left], Maps, MapOut) ->
Type = join_maps_one_key(Maps, Key, t_none()),
case t_is_equal(lookup_type(Key, MapOut), Type) of
- true -> join_maps(Left, Maps, MapOut);
- false -> join_maps(Left, Maps, enter_type(Key, Type, MapOut))
+ true -> join_maps_collect(Left, Maps, MapOut);
+ false -> [{Key, Type} | join_maps_collect(Left, Maps, MapOut)]
end;
-join_maps([], _Maps, MapOut) ->
- MapOut.
+join_maps_collect([], _Maps, _MapOut) ->
+ [].
join_maps_one_key([Map|Left], Key, AccType) ->
case t_is_any(AccType) of