Merge branch 'kostis/hipe-cleanup-19-rc1'

4 files changed, 35 insertions, 34 deletions

diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile
index 6b6cad3ed3..8ef31dbb46 100644
--- a/lib/hipe/main/Makefile
+++ b/lib/hipe/main/Makefile
@@ -70,7 +70,7 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +nowarn_shadow_vars +warn_missing_spec +warn_untyped_record
+ERL_COMPILE_FLAGS += -Werror +nowarn_shadow_vars +warn_export_vars +warn_missing_spec +warn_untyped_record
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index 981265b3e9..6c525dd143 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -449,16 +449,16 @@ compile(Name, File, Opts0) when is_atom(Name) ->
     true ->
       case filename:find_src(filename:rootname(File, ".beam")) of
 	{error, _} ->
-	  ?error_msg("Cannot find source code for ~p.",[File]),
+	  ?error_msg("Cannot find source code for ~p.", [File]),
 	  ?EXIT({cant_find_source_code});
 	{Source, CompOpts} ->
 	  CoreOpts = [X || X = {core_transform, _} <- Opts],
-	  %%io:format("Using: ~w\n", [CoreOpts]),
+	  %% io:format("Using: ~w\n", [CoreOpts]),
 	  case compile:file(Source, CoreOpts ++ [to_core, binary|CompOpts]) of
 	    {ok, _, Core} ->
 	      compile_core(Name, Core, File, Opts);
 	    Error ->
-	      ?error_msg("Error compiling ~p:\n~p.",[File, Error]),
+	      ?error_msg("Error compiling ~p:\n~p.", [File, Error]),
 	      ?EXIT({cant_compile_source_code})
 	  end
       end;
@@ -470,7 +470,7 @@ compile(Name, File, Opts0) when is_atom(Name) ->
 	{ok, _, Core} ->
 	  compile_core(Name, Core, File, Opts);
 	Error ->
-	  ?error_msg("Error compiling ~p:\n~p\n",[Source, Error]),
+	  ?error_msg("Error compiling ~p:\n~p\n", [Source, Error]),
 	  ?EXIT({cant_compile_source_code, Error})
       end;
     Other when Other =:= false; Other =:= undefined ->
@@ -573,8 +573,7 @@ file(File, Options) when is_atom(File) ->
 disasm(File) ->
   case beam_disasm:file(File) of
     #beam_file{labeled_exports = LabeledExports,
-	       compile_info = CompInfo,
-	       code = BeamCode} ->
+	       compile_info = CompInfo, code = BeamCode} ->
       CompOpts = proplists:get_value(options, CompInfo, []),
       HCompOpts = case lists:keyfind(hipe, 1, CompOpts) of
 		    {hipe, L} when is_list(L) -> L;
@@ -597,16 +596,16 @@ fix_beam_exports([], Exports) ->
   Exports.
 
 get_beam_icode(Mod, {BeamCode, Exports}, File, Options) ->
-  ?option_time({ok, Icode} =
-	       (catch {ok, hipe_beam_to_icode:module(BeamCode, Options)}),
-	       "BEAM-to-Icode", Options),
+  {ok, Icode} =
+    ?option_time((catch {ok, hipe_beam_to_icode:module(BeamCode, Options)}),
+	         "BEAM-to-Icode", Options),
   BeamBin = get_beam_code(File),
   {{Mod, Exports, Icode}, BeamBin}.
 
 get_core_icode(Mod, Core, File, Options) ->
-  ?option_time({ok, Icode} =
-	       (catch {ok, cerl_to_icode:module(Core, Options)}),
-	       "BEAM-to-Icode", Options),
+  {ok, Icode} =
+    ?option_time((catch {ok, cerl_to_icode:module(Core, Options)}),
+		 "BEAM-to-Icode", Options),
   NeedBeamCode = not proplists:get_bool(load, Options),
   BeamBin = 
     case NeedBeamCode of
@@ -619,7 +618,7 @@ get_core_icode(Mod, Core, File, Options) ->
 get_beam_code(Bin) when is_binary(Bin) -> Bin;
 get_beam_code(FileName) ->
   case erl_prim_loader:get_file(FileName) of
-    {ok,Bin,_} ->
+    {ok, Bin, _} ->
       Bin;
     error ->
       ?EXIT(no_beam_file)
diff --git a/lib/hipe/main/hipe.hrl.src b/lib/hipe/main/hipe.hrl.src
index 3be824ac34..53b59f88f0 100644
--- a/lib/hipe/main/hipe.hrl.src
+++ b/lib/hipe/main/hipe.hrl.src
@@ -152,7 +152,7 @@
 	STMNT,
 	?untagged_msg(Msg ++ "~.2f s\n",[hipe_timing:stop_timer(Timer)/1000])).
 -else.
--define(TIME_STMNT(STMNT,Msg,Timer),STMNT).
+-define(TIME_STMNT(STMNT,Msg,Timer), STMNT).
 -endif.
 
 -define(start_timer(Text), hipe_timing:start(Text, ?MODULE)).
@@ -162,22 +162,24 @@
 -define(get_hipe_timer_val(Timer), get(Timer)).
 -define(set_hipe_timer_val(Timer, Val), put(Timer, Val)).
 -define(option_time(Stmnt, Text, Options),
-        if true -> ?when_option(time, Options, ?start_timer(Text)),
-                   fun(R) ->
-                           ?when_option(time, Options, ?stop_timer(Text)),
-                           R
-                   end(Stmnt)end).
+        begin
+	    ?when_option(time, Options, ?start_timer(Text)),
+	    fun(R) ->
+		    ?when_option(time, Options, ?stop_timer(Text)),
+		    R
+	    end(Stmnt)
+	end).
 
--define(option_start_time(Text,Options),
+-define(option_start_time(Text, Options),
 	?when_option(time, Options, ?start_timer(Text))).
 
--define(option_stop_time(Text,Options),
+-define(option_stop_time(Text, Options),
 	?when_option(time, Options, ?stop_timer(Text))).
 
 -define(opt_start_timer(Text),
-	hipe_timing:start_optional_timer(Text,?MODULE)).
+	hipe_timing:start_optional_timer(Text, ?MODULE)).
 -define(opt_stop_timer(Text),
-	hipe_timing:stop_optional_timer(Text,?MODULE)).
+	hipe_timing:stop_optional_timer(Text, ?MODULE)).
      
 %%
 %% Turn on instrumentation of the compiler.
@@ -187,15 +189,15 @@
 -define(count_pre_ra_instructions(Options, NoInstrs),
 	?when_option(count_instrs, Options,
 		     put(pre_ra_instrs,
-			 get(pre_ra_instrs)+ NoInstrs))).
+			 get(pre_ra_instrs) + NoInstrs))).
 -define(count_post_ra_instructions(Options, NoInstrs),
 	?when_option(count_instrs, Options,
 		     put(post_ra_instrs,
-			 get(post_ra_instrs)+ NoInstrs))).
+			 get(post_ra_instrs) + NoInstrs))).
 
 -define(start_time_regalloc(Options),
 	?when_option(timeregalloc, Options, 
-		     put(regalloctime1,erlang:statistics(runtime)))).
+		     put(regalloctime1, erlang:statistics(runtime)))).
 -define(stop_time_regalloc(Options),
 	?when_option(timeregalloc, Options, 
 		     put(regalloctime,
@@ -215,11 +217,11 @@
 -define(count_pre_ra_temps(Options, NoTemps),
 	?when_option(count_temps, Options,
 		     put(pre_ra_temps,
-			 get(pre_ra_temps)+ NoTemps))).
+			 get(pre_ra_temps) + NoTemps))).
 -define(count_post_ra_temps(Options, NoTemps),
 	?when_option(count_temps, Options,
 		     put(post_ra_temps,
-			 get(post_ra_temps)+ NoTemps))).
+			 get(post_ra_temps) + NoTemps))).
 
 -define(inc_counter(Counter, Val),
 	case get(Counter) of
@@ -255,7 +257,7 @@
 	  ?count_post_ra_instructions(Options, NoInstrs),
 	  ?cons_counter(counter_mem_temps, get(counter_mfa_mem_temps)),
 	  ?cons_counter(ra_all_iterations_counter, get(ra_iteration_counter)),
-	  put(ra_iteration_counter,0),
+	  put(ra_iteration_counter, 0),
 	  ?count_post_ra_temps(Options, NoTemps)
 	end).
 
@@ -264,12 +266,12 @@
 		     put(spilledtemps, get(spilledtemps) + NoSpills))).
 
 -define(optional_start_timer(Timer, Options),
-	case lists:member(Timer, proplists:get_value(timers,Options++[{timers,[]}])) of
+	case lists:member(Timer, proplists:get_value(timers, Options++[{timers,[]}])) of
 	  true -> ?start_hipe_timer(Timer);
 	  false -> true
 	end).
 -define(optional_stop_timer(Timer, Options),
-	case lists:member(Timer, proplists:get_value(timers,Options++[{timers,[]}])) of
+	case lists:member(Timer, proplists:get_value(timers, Options++[{timers,[]}])) of
 	  true -> ?stop_hipe_timer(Timer);
 	  false -> true
 	end).
@@ -316,4 +318,4 @@
 	                    'unknown' | {'reg' | 'fp_reg' | 'spill',
 	                                 non_neg_integer()}}].
 -type hipe_temp_map()  :: tuple().
--type hipe_spill_map() :: [{non_neg_integer(), {'spill',non_neg_integer()}}].
+-type hipe_spill_map() :: [{non_neg_integer(), {'spill', non_neg_integer()}}].
diff --git a/lib/hipe/main/hipe_main.erl b/lib/hipe/main/hipe_main.erl
index b9d783d20a..4b89feb48a 100644
--- a/lib/hipe/main/hipe_main.erl
+++ b/lib/hipe/main/hipe_main.erl
@@ -296,7 +296,7 @@ icode_ssa_convert(IcodeCfg, Options) ->
 icode_ssa_const_prop(IcodeSSA, Options) ->
   case proplists:get_bool(icode_ssa_const_prop, Options) of
     true ->
-      ?option_time(Tmp=hipe_icode_ssa_const_prop:propagate(IcodeSSA),
+      Tmp = ?option_time(hipe_icode_ssa_const_prop:propagate(IcodeSSA),
 		   "Icode SSA sparse conditional constant propagation", Options),
       ?option_time(hipe_icode_ssa:remove_dead_code(Tmp),
 		   "Icode SSA dead code elimination pass 1", Options);