1 files changed, 42 insertions, 8 deletions

diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl
index 3e68d64d53..e013d39a0e 100644
--- a/lib/dialyzer/src/dialyzer_cl.erl
+++ b/lib/dialyzer/src/dialyzer_cl.erl
@@ -504,7 +504,9 @@ hipe_compile(Files, #options{erlang_mode = ErlangMode} = Options) ->
 	_ ->
 	  Mods = [lists, dict, digraph, digraph_utils, ets,
 		  gb_sets, gb_trees, ordsets, sets, sofs,
-		  cerl, cerl_trees, erl_types, erl_bif_types,
+		  %cerl,      % uses maps instructions
+		  %erl_types, % uses maps instructions
+		  cerl_trees, erl_bif_types,
 		  dialyzer_analysis_callgraph, dialyzer, dialyzer_behaviours,
 		  dialyzer_codeserver, dialyzer_contracts,
 		  dialyzer_coordinator, dialyzer_dataflow, dialyzer_dep,
@@ -533,7 +535,7 @@ hc(Mod) ->
   case code:is_module_native(Mod) of
     true -> ok;
     false ->
-      %% io:format(" ~s", [Mod]),
+      %% io:format(" ~w", [Mod]),
       {ok, Mod} = hipe:c(Mod),
       ok
   end.
@@ -656,7 +658,8 @@ return_value(State = #cl_state{erlang_mode = ErlangMode,
 			       mod_deps = ModDeps,
 			       output_plt = OutputPlt,
 			       plt_info = PltInfo,
-			       stored_warnings = StoredWarnings},
+			       stored_warnings = StoredWarnings,
+                               legal_warnings = LegalWarnings},
 	     Plt) ->
   case OutputPlt =:= none of
     true -> ok;
@@ -676,16 +679,33 @@ return_value(State = #cl_state{erlang_mode = ErlangMode,
       maybe_close_output_file(State),
       {RetValue, []};
     true -> 
-      {RetValue, process_warnings(StoredWarnings)}
+      Unknown =
+        case ordsets:is_element(?WARN_UNKNOWN, LegalWarnings) of
+          true ->
+            unknown_functions(State) ++
+              unknown_types(State) ++
+              unknown_behaviours(State);
+          false -> []
+        end,
+      UnknownWarnings =
+        [{?WARN_UNKNOWN, {_Filename = "", _Line = 0}, W} || W <- Unknown],
+      AllWarnings =
+        UnknownWarnings ++ process_warnings(StoredWarnings),
+      {RetValue, AllWarnings}
   end.
 
+unknown_functions(#cl_state{external_calls = Calls}) ->
+  [{unknown_function, MFA} || MFA <- Calls].
+
 print_ext_calls(#cl_state{report_mode = quiet}) ->
   ok;
 print_ext_calls(#cl_state{output = Output,
 			  external_calls = Calls,
 			  stored_warnings = Warnings,
-			  output_format = Format}) ->
-  case Calls =:= [] of
+			  output_format = Format,
+                          legal_warnings = LegalWarnings}) ->
+  case not ordsets:is_element(?WARN_UNKNOWN, LegalWarnings)
+    orelse Calls =:= [] of
     true -> ok;
     false ->
       case Warnings =:= [] of
@@ -708,14 +728,19 @@ do_print_ext_calls(Output, [{M,F,A}|T], Before) ->
 do_print_ext_calls(_, [], _) ->
   ok.
 
+unknown_types(#cl_state{external_types = Types}) ->
+  [{unknown_type, MFA} || MFA <- Types].
+
 print_ext_types(#cl_state{report_mode = quiet}) ->
   ok;
 print_ext_types(#cl_state{output = Output,
                           external_calls = Calls,
                           external_types = Types,
                           stored_warnings = Warnings,
-                          output_format = Format}) ->
-  case Types =:= [] of
+                          output_format = Format,
+                          legal_warnings = LegalWarnings}) ->
+  case not ordsets:is_element(?WARN_UNKNOWN, LegalWarnings)
+    orelse Types =:= [] of
     true -> ok;
     false ->
       case Warnings =:= [] andalso Calls =:= [] of
@@ -738,6 +763,15 @@ do_print_ext_types(Output, [{M,F,A}|T], Before) ->
 do_print_ext_types(_, [], _) ->
   ok.
 
+unknown_behaviours(#cl_state{unknown_behaviours = DupBehaviours,
+                             legal_warnings = LegalWarnings}) ->
+  case ordsets:is_element(?WARN_BEHAVIOUR, LegalWarnings) of
+    false -> [];
+    true ->
+      Behaviours = lists:usort(DupBehaviours),
+      [{unknown_behaviour, B} || B <- Behaviours]
+  end.
+
 %%print_unknown_behaviours(#cl_state{report_mode = quiet}) ->
 %%  ok;
 print_unknown_behaviours(#cl_state{output = Output,