Fix crash related with the contract blame assignment patch

The relevant commit is 8342fcf5395133a19d647f2ace606af9b7fc1732.
The old patch could emit warnings even for function that had a
problematic spec even without refinement. This warnings would
consume the relevant invalid spec warnings. This patch takes
care of this by ensuring that normal invalid spec messages are
emitted if the call that triggers the blame contract range
warning is in another module.

5 files changed, 79 insertions, 26 deletions

diff --git a/lib/dialyzer/src/dialyzer_succ_typings.erl b/lib/dialyzer/src/dialyzer_succ_typings.erl
index 24d6013692..b8da57d3f9 100644
--- a/lib/dialyzer/src/dialyzer_succ_typings.erl
+++ b/lib/dialyzer/src/dialyzer_succ_typings.erl
@@ -155,19 +155,24 @@ postprocess_dataflow_warns(RawWarnings, State, WarnAcc) ->
 
 postprocess_dataflow_warns([], _State, WAcc, Acc) ->
   {WAcc, lists:reverse(Acc)};
-postprocess_dataflow_warns([{?WARN_CONTRACT_RANGE, {File, CallL}, Msg}|Rest],
+postprocess_dataflow_warns([{?WARN_CONTRACT_RANGE, {CallF, CallL}, Msg}|Rest],
 			   #st{codeserver = Codeserver} = State, WAcc, Acc) ->
   {contract_range, [Contract, M, F, A, ArgStrings, CRet]} = Msg,
-  {ok, {{File, _ContrL} = FileLine, _C}} =
+  {ok, {{ContrF, _ContrL} = FileLine, _C}} =
     dialyzer_codeserver:lookup_mfa_contract({M,F,A}, Codeserver),
-  NewMsg =
-    {contract_range, [Contract, M, F, ArgStrings, CallL, CRet]},
-  W = {?WARN_CONTRACT_RANGE, FileLine, NewMsg},
-  Filter =
-    fun({?WARN_CONTRACT_TYPES, FL, _}) when FL =:= FileLine -> false;
-       (_) -> true
-    end,
-  postprocess_dataflow_warns(Rest, State, lists:filter(Filter, WAcc), [W|Acc]);
+  case CallF =:= ContrF of
+    true ->
+      NewMsg = {contract_range, [Contract, M, F, ArgStrings, CallL, CRet]},
+      W = {?WARN_CONTRACT_RANGE, FileLine, NewMsg},
+      Filter =
+	fun({?WARN_CONTRACT_TYPES, FL, _}) when FL =:= FileLine -> false;
+	   (_) -> true
+	end,
+      FilterWAcc = lists:filter(Filter, WAcc),
+      postprocess_dataflow_warns(Rest, State, FilterWAcc, [W|Acc]);
+    false ->
+      postprocess_dataflow_warns(Rest, State, WAcc, Acc)
+  end;
 postprocess_dataflow_warns([W|Rest], State, Wacc, Acc) ->
   postprocess_dataflow_warns(Rest, State, Wacc, [W|Acc]).
   
diff --git a/lib/dialyzer/test/small_tests_SUITE.erl b/lib/dialyzer/test/small_tests_SUITE.erl
index 21a2c76160..dbcc044eea 100644
--- a/lib/dialyzer/test/small_tests_SUITE.erl
+++ b/lib/dialyzer/test/small_tests_SUITE.erl
@@ -18,18 +18,18 @@
          contract5/1, disj_norm_form/1, eqeq/1, ets_select/1, 
          exhaust_case/1, failing_guard1/1, flatten/1, fun_app/1, 
          fun_ref_match/1, fun_ref_record/1, gencall/1, gs_make/1, 
-         inf_loop2/1, letrec1/1, list_match/1, lzip/1, make_tuple/1, 
-         minus_minus/1, mod_info/1, my_filter/1, my_sofs/1, no_match/1, 
-         no_unused_fun/1, no_unused_fun2/1, non_existing/1, 
-         not_guard_crash/1, or_bug/1, orelsebug/1, orelsebug2/1, 
-         overloaded1/1, port_info_test/1, process_info_test/1, pubsub/1, 
-         receive1/1, record_construct/1, record_pat/1, 
-         record_send_test/1, record_test/1, recursive_types1/1, 
-         recursive_types2/1, recursive_types3/1, recursive_types4/1, 
-         recursive_types5/1, recursive_types6/1, recursive_types7/1, 
-         refine_bug1/1, toth/1, trec/1, try1/1, tuple1/1, 
-         unsafe_beamcode_bug/1, unused_cases/1, unused_clauses/1, 
-         zero_tuple/1]).
+         inf_loop2/1, invalid_specs/1, letrec1/1, list_match/1, lzip/1,
+         make_tuple/1, minus_minus/1, mod_info/1, my_filter/1,
+         my_sofs/1, no_match/1, no_unused_fun/1, no_unused_fun2/1,
+         non_existing/1, not_guard_crash/1, or_bug/1, orelsebug/1,
+         orelsebug2/1, overloaded1/1, port_info_test/1,
+         process_info_test/1, pubsub/1, receive1/1, record_construct/1,
+         record_pat/1, record_send_test/1, record_test/1,
+         recursive_types1/1, recursive_types2/1, recursive_types3/1,
+         recursive_types4/1, recursive_types5/1, recursive_types6/1,
+         recursive_types7/1, refine_bug1/1, toth/1, trec/1, try1/1,
+         tuple1/1, unsafe_beamcode_bug/1, unused_cases/1,
+         unused_clauses/1, zero_tuple/1]).
 
 suite() ->
   [{timetrap, {minutes, 1}}].
@@ -51,10 +51,10 @@ all() ->
    atom_guard,atom_widen,bs_fail_constr,bs_utf8,cerl_hipeify,comm_layer,
    compare1,confusing_warning,contract2,contract3,contract5,disj_norm_form,
    eqeq,ets_select,exhaust_case,failing_guard1,flatten,fun_app,fun_ref_match,
-   fun_ref_record,gencall,gs_make,inf_loop2,letrec1,list_match,lzip,
-   make_tuple,minus_minus,mod_info,my_filter,my_sofs,no_match,no_unused_fun,
-   no_unused_fun2,non_existing,not_guard_crash,or_bug,orelsebug,orelsebug2,
-   overloaded1,port_info_test,process_info_test,pubsub,receive1,
+   fun_ref_record,gencall,gs_make,inf_loop2,invalid_specs,letrec1,list_match,
+   lzip,make_tuple,minus_minus,mod_info,my_filter,my_sofs,no_match,
+   no_unused_fun,no_unused_fun2,non_existing,not_guard_crash,or_bug,orelsebug,
+   orelsebug2,overloaded1,port_info_test,process_info_test,pubsub,receive1,
    record_construct,record_pat,record_send_test,record_test,recursive_types1,
    recursive_types2,recursive_types3,recursive_types4,recursive_types5,
    recursive_types6,recursive_types7,refine_bug1,toth,trec,try1,tuple1,
@@ -235,6 +235,12 @@ inf_loop2(Config) ->
     Error  -> ct:fail(Error)
   end.
 
+invalid_specs(Config) ->
+  case dialyze(Config, invalid_specs) of
+    'same' -> 'same';
+    Error  -> ct:fail(Error)
+  end.
+
 letrec1(Config) ->
   case dialyze(Config, letrec1) of
     'same' -> 'same';
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/results/invalid_specs b/lib/dialyzer/test/small_tests_SUITE_data/results/invalid_specs
new file mode 100644
index 0000000000..c95c0ff1f8
--- /dev/null
+++ b/lib/dialyzer/test/small_tests_SUITE_data/results/invalid_specs
@@ -0,0 +1,3 @@
+
+invalid_spec1.erl:5: Invalid type specification for function invalid_spec1:get_plan_dirty/1. The success typing is ([string()]) -> {maybe_improper_list(),[atom()]}
+invalid_spec2.erl:5: Function foo/0 has no local return
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/invalid_specs/invalid_spec1.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/invalid_specs/invalid_spec1.erl
new file mode 100644
index 0000000000..06ab2f9a22
--- /dev/null
+++ b/lib/dialyzer/test/small_tests_SUITE_data/src/invalid_specs/invalid_spec1.erl
@@ -0,0 +1,28 @@
+-module(invalid_spec1).
+
+-export([get_plan_dirty/1]).
+
+-spec get_plan_dirty([string()]) -> {{atom(), any()}, [atom()]}.
+
+get_plan_dirty(ClassL) ->
+    get_plan_dirty(ClassL, [], []).
+
+get_plan_dirty([], Res, FoundClassList) ->
+    {Res,FoundClassList};
+get_plan_dirty([Class|ClassL], Res, FoundClassList) ->
+    ClassPlan = list_to_atom(Class ++ "_plan"),
+    case catch mnesia:dirty_all_keys(ClassPlan) of
+        {'EXIT',_} ->
+            get_plan_dirty(ClassL, Res, FoundClassList);
+        [] ->
+            get_plan_dirty(ClassL, Res, FoundClassList);
+        KeyL ->
+            ClassAtom = list_to_atom(Class),
+            Res2 =
+                lists:foldl(fun(Key, Acc) ->
+                                   [{ClassAtom,Key}|Acc]
+                            end,
+                            Res,
+                            KeyL),
+            get_plan_dirty(ClassL, Res2, [ClassAtom|FoundClassList])
+    end.
diff --git a/lib/dialyzer/test/small_tests_SUITE_data/src/invalid_specs/invalid_spec2.erl b/lib/dialyzer/test/small_tests_SUITE_data/src/invalid_specs/invalid_spec2.erl
new file mode 100644
index 0000000000..e49f73d014
--- /dev/null
+++ b/lib/dialyzer/test/small_tests_SUITE_data/src/invalid_specs/invalid_spec2.erl
@@ -0,0 +1,11 @@
+-module(invalid_spec2).
+
+-export([foo/0]).
+
+foo() ->
+    case
+	invalid_spec1:get_plan_dirty(mnesia:dirty_all_keys(cmClassInfo))
+    of
+	{[],[]} -> foo;
+	{ _, _} -> bar
+    end.