Merge branch 'ks/dialyzer-R16B-final-fixes/OTP-10865'

* ks/dialyzer-R16B-final-fixes/OTP-10865:
  Native code compilation changes
  Code simplification
  Simplify a case construct using inequality
  Simplify a case construct using a boolean operator
  Code simplifications + take out obsolete note

5 files changed, 33 insertions, 42 deletions

diff --git a/lib/dialyzer/src/dialyzer_behaviours.erl b/lib/dialyzer/src/dialyzer_behaviours.erl
index 36aef2a37f..bf0d08cf8f 100644
--- a/lib/dialyzer/src/dialyzer_behaviours.erl
+++ b/lib/dialyzer/src/dialyzer_behaviours.erl
@@ -25,8 +25,6 @@
 %%%
 %%% Created     : 28 Oct 2009 by Stavros Aronis <[email protected]>
 %%%-------------------------------------------------------------------
-%%% NOTE: This module is currently experimental -- do NOT rely on it!
-%%%-------------------------------------------------------------------
 
 -module(dialyzer_behaviours).
 
@@ -127,15 +125,12 @@ check_all_callbacks(Module, Behaviour, [Cb|Rest],
 		     erl_types:t_to_string(CbReturnType, Records)]}|Acc00]
 	      end
 	  end,
-	Acc02 =
-	  case erl_types:any_none(
-		 erl_types:t_inf_lists(ArgTypes, CbArgTypes)) of
-	    false -> Acc01;
-	    true ->
-	      find_mismatching_args(type, ArgTypes, CbArgTypes, Behaviour,
-				    Function, Arity, Records, 1, Acc01)
-	  end,
-	Acc02
+	case erl_types:any_none(erl_types:t_inf_lists(ArgTypes, CbArgTypes)) of
+	  false -> Acc01;
+	  true ->
+	    find_mismatching_args(type, ArgTypes, CbArgTypes, Behaviour,
+				  Function, Arity, Records, 1, Acc01)
+	end
     end,
   Acc2 =
     case dialyzer_codeserver:lookup_mfa_contract(CbMFA, Codeserver) of
@@ -157,16 +152,14 @@ check_all_callbacks(Module, Behaviour, [Cb|Rest],
 		 erl_types:t_to_string(ExtraType, Records),
 		 erl_types:t_to_string(CbReturnType, Records)]}|Acc10]
 	  end,
-	Acc12 =
-	  case erl_types:any_none(
-		 erl_types:t_inf_lists(SpecArgTypes, CbArgTypes)) of
-	    false -> Acc11;
-	    true ->
-	      find_mismatching_args({spec, File, Line}, SpecArgTypes,
-				    CbArgTypes, Behaviour, Function,
-				    Arity, Records, 1, Acc11)
-	  end,
-	Acc12
+	case erl_types:any_none(
+	       erl_types:t_inf_lists(SpecArgTypes, CbArgTypes)) of
+	  false -> Acc11;
+	  true ->
+	    find_mismatching_args({spec, File, Line}, SpecArgTypes,
+				  CbArgTypes, Behaviour, Function,
+				  Arity, Records, 1, Acc11)
+	end
     end,
   NewAcc = Acc2,
   check_all_callbacks(Module, Behaviour, Rest, State, NewAcc).
diff --git a/lib/dialyzer/src/dialyzer_callgraph.erl b/lib/dialyzer/src/dialyzer_callgraph.erl
index 64e0ee88af..9e9226fa5a 100644
--- a/lib/dialyzer/src/dialyzer_callgraph.erl
+++ b/lib/dialyzer/src/dialyzer_callgraph.erl
@@ -798,10 +798,7 @@ condensation(G) ->
     fun({V1, V2}) ->
         I1 = ets:lookup_element(V2I, V1, 2),
         I2 = ets:lookup_element(V2I, V2, 2),
-	case I1 =:= I2 of
-	  true  -> true;
-	  false -> ets:insert(I2I, {I1, I2})
-	end
+	I1 =:= I2 orelse ets:insert(I2I, {I1, I2})
     end,
   lists:foreach(Fun1, digraph:edges(G)),
   Fun3 =
diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl
index 6732d96b98..967aa989fb 100644
--- a/lib/dialyzer/src/dialyzer_cl.erl
+++ b/lib/dialyzer/src/dialyzer_cl.erl
@@ -488,6 +488,7 @@ expand_dependent_modules_1([Mod|Mods], Included, ModDeps) ->
 expand_dependent_modules_1([], Included, _ModDeps) ->
   Included.
 
+-define(MIN_PARALLELISM, 7).
 -define(MIN_FILES_FOR_NATIVE_COMPILE, 20).
 
 -spec hipe_compile([file:filename()], #options{}) -> 'ok'.
@@ -501,11 +502,14 @@ hipe_compile(Files, #options{erlang_mode = ErlangMode} = Options) ->
       case erlang:system_info(hipe_architecture) of
 	undefined -> ok;
 	_ ->
-	  Mods = [lists, dict, gb_sets, gb_trees, ordsets, sets,
+	  Mods = [lists, dict, digraph, digraph_utils, ets,
+		  gb_sets, gb_trees, ordsets, sets, sofs,
 		  cerl, cerl_trees, erl_types, erl_bif_types,
-		  dialyzer_analysis_callgraph, dialyzer_codeserver,
-		  dialyzer_dataflow, dialyzer_dep, dialyzer_plt,
-		  dialyzer_succ_typings, dialyzer_typesig],
+		  dialyzer_analysis_callgraph, dialyzer, dialyzer_behaviours,
+		  dialyzer_codeserver, dialyzer_contracts,
+		  dialyzer_coordinator, dialyzer_dataflow, dialyzer_dep,
+		  dialyzer_plt, dialyzer_succ_typings, dialyzer_typesig,
+		  dialyzer_typesig, dialyzer_worker],
 	  report_native_comp(Options),
 	  {T1, _} = statistics(wall_clock),
 	  native_compile(Mods),
@@ -515,12 +519,12 @@ hipe_compile(Files, #options{erlang_mode = ErlangMode} = Options) ->
   end.
 
 native_compile(Mods) ->
-  case erlang:system_info(schedulers) of
-    %% N when N > 1 ->
-    %%   Parent = self(),
-    %%   Pids = [spawn(fun () -> Parent ! {self(), hc(M)} end) || M <- Mods],
-    %%   lists:foreach(fun (Pid) -> receive {Pid, Res} -> Res end end, Pids);
-    _ -> % 1 ->
+  case dialyzer_utils:parallelism() > ?MIN_PARALLELISM of
+    true ->
+      Parent = self(),
+      Pids = [spawn(fun () -> Parent ! {self(), hc(M)} end) || M <- Mods],
+      lists:foreach(fun (Pid) -> receive {Pid, Res} -> Res end end, Pids);
+    false ->
       lists:foreach(fun (Mod) -> hc(Mod) end, Mods)
   end.
 
@@ -529,6 +533,7 @@ hc(Mod) ->
   case code:is_module_native(Mod) of
     true -> ok;
     false ->
+      %% io:format(" ~s", [Mod]),
       {ok, Mod} = hipe:c(Mod),
       ok
   end.
diff --git a/lib/dialyzer/src/dialyzer_codeserver.erl b/lib/dialyzer/src/dialyzer_codeserver.erl
index 9989118671..5109bf968a 100644
--- a/lib/dialyzer/src/dialyzer_codeserver.erl
+++ b/lib/dialyzer/src/dialyzer_codeserver.erl
@@ -100,10 +100,7 @@ ets_dict_to_dict(Table) ->
   ets:foldl(Fold, dict:new(), Table).
 
 ets_set_is_element(Key, Table) ->
-  case ets:lookup(Table, Key) of
-      [] -> false;
-      _ -> true
-  end.
+  ets:lookup(Table, Key) =/= [].
 
 ets_set_insert_set(Set, Table) ->
   ets_set_insert_list(sets:to_list(Set), Table).
@@ -116,7 +113,7 @@ ets_set_to_set(Table) ->
   ets:foldl(Fold, sets:new(), Table).
 
 ets_read_concurrent_table(Name) ->
-  ets:new(Name,[{read_concurrency, true}]).
+  ets:new(Name, [{read_concurrency, true}]).
 
 %%--------------------------------------------------------------------
 
diff --git a/lib/dialyzer/src/dialyzer_typesig.erl b/lib/dialyzer/src/dialyzer_typesig.erl
index 8c0e45c8da..40d8936afa 100644
--- a/lib/dialyzer/src/dialyzer_typesig.erl
+++ b/lib/dialyzer/src/dialyzer_typesig.erl
@@ -1543,12 +1543,11 @@ get_bif_constr({erlang, '==', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 			   mk_constraint(Arg1, sub, ArgV1),
 			   mk_constraint(Arg2, sub, ArgV2)]);
 get_bif_constr({erlang, element, 2} = _BIF, Dst, Args,
-               #state{cs = Constrs} = State) ->
+               #state{cs = Constrs, opaques = Opaques}) ->
   GenType = erl_bif_types:type(erlang, element, 2),
   case t_is_none(GenType) of
     true -> ?debug("Bif: ~w failed\n", [_BIF]), throw(error);
     false ->
-      Opaques = State#state.opaques,
       Fun = fun(Map) ->
 		[I, T] = ATs = lookup_type_list(Args, Map),
 		ATs2 = case lists:member(T, Opaques) of