Cleanups in hipe/main and hipe/rtl

* Rewrite matching statements in ?when_option macro to form that silences
  dialyzer's unmatched_return warnings
* Treat compiler warnings as errors when compiling files in main

5 files changed, 46 insertions, 46 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 0eaf06cb06..6c525dd143 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -596,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
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);
diff --git a/lib/hipe/rtl/hipe_rtl_lcm.erl b/lib/hipe/rtl/hipe_rtl_lcm.erl
index ef866d0843..5d5668434e 100644
--- a/lib/hipe/rtl/hipe_rtl_lcm.erl
+++ b/lib/hipe/rtl/hipe_rtl_lcm.erl
@@ -63,10 +63,10 @@ rtl_lcm(CFG, Options) ->
   
   pp_debug("-------------------------------------------------~n",[]),
   %% pp_debug( "~w~n", [MFA]),
-  
+
   %% A check if we should pretty print the result.
   case proplists:get_bool(pp_rtl_lcm, Options) of
-    true->
+    true ->
       pp_debug("-------------------------------------------------~n",[]),
       %% pp_debug("AllExpr:  ~w~n", [AllExpr]),
       pp_debug("AllExpr:~n", []),
@@ -76,21 +76,21 @@ rtl_lcm(CFG, Options) ->
     _ ->
       ok
   end,
-  
+
   pp_debug("-------------------------------------------------~n",[]),
-  ?option_time({CFG1, MoveSet} = perform_lcm(CFG, NodeInfo, EdgeInfo, ExprMap, 
-					     IdMap, AllExpr, mk_edge_bb_map(), 
+  {CFG1, MoveSet} = ?option_time(perform_lcm(CFG, NodeInfo, EdgeInfo, ExprMap,
+					     IdMap, AllExpr, mk_edge_bb_map(),
 					     ?SETS:new(), Labels),
-	       "RTL LCM perform_lcm", Options),
+				 "RTL LCM perform_lcm", Options),
 
   %% Scan through list of moved expressions and replace their 
   %% assignments with the new temporary created for that expression
   MoveList = ?SETS:to_list(MoveSet),
-  ?option_time(CFG2 = moved_expr_replace_assignments(CFG1, ExprMap, IdMap, 
+  CFG2 = ?option_time(moved_expr_replace_assignments(CFG1, ExprMap, IdMap,
 						     MoveList),
-	       "RTL LCM moved_expr_replace_assignments", Options),
+		      "RTL LCM moved_expr_replace_assignments", Options),
   pp_debug("-------------------------------------------------~n~n",[]),
-  
+
   CFG2.
 
 %%=============================================================================
@@ -466,10 +466,10 @@ expr_clear_dst(I) ->
 %% easy access later.
 lcm_precalc(CFG, Options) ->
   %% Calculate use map and expression map.
-  ?option_time({ExprMap, IdMap} = mk_expr_map(CFG), 
-	       "RTL LCM mk_expr_map", Options),
-  ?option_time(UseMap = mk_use_map(CFG, ExprMap), 
-	       "RTL LCM mk_use_map", Options),
+  {ExprMap, IdMap} = ?option_time(mk_expr_map(CFG),
+				  "RTL LCM mk_expr_map", Options),
+  UseMap = ?option_time(mk_use_map(CFG, ExprMap),
+			"RTL LCM mk_use_map", Options),
   %% Labels = hipe_rtl_cfg:reverse_postorder(CFG),
   Labels = hipe_rtl_cfg:labels(CFG),
   %% StartLabel = hipe_rtl_cfg:start_label(CFG),
@@ -477,28 +477,28 @@ lcm_precalc(CFG, Options) ->
   AllExpr = ?SETS:from_list(gb_trees:keys(IdMap)),
 
   %% Calculate the data sets.
-  ?option_time(NodeInfo0 = mk_node_info(Labels), "RTL LCM mk_node_info", 
-	       Options),
+  NodeInfo0 = ?option_time(mk_node_info(Labels),
+			   "RTL LCM mk_node_info", Options),
   %% ?option_time(EdgeInfo0 = mk_edge_info(), "RTL LCM mk_edge_info", 
   %%  	          Options),
   EdgeInfo0 = mk_edge_info(),
-  ?option_time(NodeInfo1 = calc_up_exp(CFG, ExprMap, NodeInfo0, Labels), 
-	       "RTL LCM calc_up_exp", Options),
-  ?option_time(NodeInfo2 = calc_down_exp(CFG, ExprMap, NodeInfo1, Labels), 
-	       "RTL LCM calc_down_exp", Options),
-  ?option_time(NodeInfo3 = calc_killed_expr(CFG, NodeInfo2, UseMap, AllExpr, 
+  NodeInfo1 = ?option_time(calc_up_exp(CFG, ExprMap, NodeInfo0, Labels),
+			   "RTL LCM calc_up_exp", Options),
+  NodeInfo2 = ?option_time(calc_down_exp(CFG, ExprMap, NodeInfo1, Labels),
+			   "RTL LCM calc_down_exp", Options),
+  NodeInfo3 = ?option_time(calc_killed_expr(CFG, NodeInfo2, UseMap, AllExpr,
 					    IdMap, Labels), 
-	       "RTL LCM calc_killed_exp", Options),
-  ?option_time(NodeInfo4 = calc_avail(CFG, NodeInfo3), 
-	       "RTL LCM calc_avail", Options),
-  ?option_time(NodeInfo5 = calc_antic(CFG, NodeInfo4, AllExpr), 
-	       "RTL LCM calc_antic", Options),
-  ?option_time(EdgeInfo1 = calc_earliest(CFG, NodeInfo5, EdgeInfo0, Labels), 
-  	       "RTL LCM calc_earliest", Options),
-  ?option_time({NodeInfo6, EdgeInfo2} = calc_later(CFG, NodeInfo5, EdgeInfo1),
-	       "RTL LCM calc_later", Options),
-  ?option_time(NodeInfo7 = calc_delete(CFG, NodeInfo6, Labels), 
-	       "RTL LCM calc_delete", Options),
+			   "RTL LCM calc_killed_exp", Options),
+  NodeInfo4 = ?option_time(calc_avail(CFG, NodeInfo3),
+			   "RTL LCM calc_avail", Options),
+  NodeInfo5 = ?option_time(calc_antic(CFG, NodeInfo4, AllExpr),
+			   "RTL LCM calc_antic", Options),
+  EdgeInfo1 = ?option_time(calc_earliest(CFG, NodeInfo5, EdgeInfo0, Labels),
+			   "RTL LCM calc_earliest", Options),
+  {NodeInfo6, EdgeInfo2} = ?option_time(calc_later(CFG, NodeInfo5, EdgeInfo1),
+					"RTL LCM calc_later", Options),
+  NodeInfo7 = ?option_time(calc_delete(CFG, NodeInfo6, Labels),
+			   "RTL LCM calc_delete", Options),
   {NodeInfo7, EdgeInfo2, AllExpr, ExprMap, IdMap, Labels}.
 
 %%%%%%%%%%%%%%%%%%% AVAILABLE IN/OUT FLOW ANALYSIS %%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/hipe/rtl/hipe_rtl_ssapre.erl b/lib/hipe/rtl/hipe_rtl_ssapre.erl
index e248457806..e71617e2e9 100644
--- a/lib/hipe/rtl/hipe_rtl_ssapre.erl
+++ b/lib/hipe/rtl/hipe_rtl_ssapre.erl
@@ -107,7 +107,7 @@ rtl_ssapre(RtlSSACfg, Options) ->
   case XsiList of
     [] ->
       %% No Xsi
-      ?option_time(?pp_debug("~n~n################ No Xsi Inserted ################~n",[]),"RTL A-SSAPRE No Xsi inserted (skip Downsafety and Will Be Available)",Options),
+      ?pp_debug("~n~n################ No Xsi Inserted ################~n",[]),
       ok;
     _ ->
       ?pp_debug("~n############ Downsafety ##########~n",[]),
@@ -126,7 +126,7 @@ rtl_ssapre(RtlSSACfg, Options) ->
   ?pp_debug("~n~n################ Xsi CFG ################~n",[]),pp_cfg(CFG2,XsiGraph),
 
   init_redundancy_count(),
-  ?option_time(FinalCFG=perform_code_motion(Labels,CFG2,XsiGraph),"RTL A-SSAPRE Code Motion",Options),
+  FinalCFG = ?option_time(perform_code_motion(Labels,CFG2,XsiGraph),"RTL A-SSAPRE Code Motion",Options),
   
   ?pp_debug("\n############ No more need for the Xsi Graph....Deleting...",[]),?GRAPH:delete(XsiGraph),
 
@@ -146,7 +146,7 @@ perform_Xsi_insertion(Cfg, Options) ->
   init_counters(), %% Init counters for Bottoms and Temps
   DigraphOpts = [cyclic, private],
   XsiGraph = digraph:new(DigraphOpts),
-  %% Be carefull, the digraph component is NOT garbage collected,
+  %% Be careful, the digraph component is NOT garbage collected,
   %% so don't create 20 millions of instances!
   %% finds the longest depth
   %% Depth-first, preorder traversal over Basic Blocks.
@@ -154,13 +154,13 @@ perform_Xsi_insertion(Cfg, Options) ->
   Labels = ?CFG:preorder(Cfg), 
 
   ?pp_debug("~n~n############# Finding definitions for computation~n~n",[]),
-  ?option_time({Cfg2,XsiGraph} = find_definition_for_computations(Labels,Cfg,XsiGraph),"RTL A-SSAPRE Xsi Insertion, searching from instructions",Options),
+  {Cfg2,XsiGraph} = ?option_time(find_definition_for_computations(Labels,Cfg,XsiGraph),"RTL A-SSAPRE Xsi Insertion, searching from instructions",Options),
 
   %% Active List creation
   GeneratorXsiList = lists:sort(?GRAPH:vertices(XsiGraph)),
   ?pp_debug("~n~n############# Inserted Xsis ~w",[GeneratorXsiList]),
   ?pp_debug("~n~n############# Finding operands~n",[]),
-  ?option_time({Cfg3,XsiGraph} = find_operands(Cfg2,XsiGraph,GeneratorXsiList,0),"RTL A-SSAPRE Xsi Insertion, finding operands",Options),
+  {Cfg3,XsiGraph} = ?option_time(find_operands(Cfg2,XsiGraph,GeneratorXsiList,0),"RTL A-SSAPRE Xsi Insertion, finding operands",Options),
 
   %% Creating the CFGGraph
   ?pp_debug("~n~n############# Creating CFG Graph",[]),
@@ -170,9 +170,9 @@ perform_Xsi_insertion(Cfg, Options) ->
   ?pp_debug("~nAdding a vertex for the start label: ~w",[StartLabel]),
   ?GRAPH:add_vertex(CFGGraph, StartLabel, #block{type = top}),
                                                 % Doing the others
-  ?option_time(MPs=create_cfggraph(Others,Cfg3,CFGGraph,[],[],[],XsiGraph),"RTL A-SSAPRE Xsi Insertion, creating intermediate 'SSAPRE Graph'",Options),
+  MPs = ?option_time(create_cfggraph(Others,Cfg3,CFGGraph,[],[],[],XsiGraph),"RTL A-SSAPRE Xsi Insertion, creating intermediate 'SSAPRE Graph'",Options),
 
-  %% Return the bloody collected information
+  %% Return the collected information
   {Cfg3,XsiGraph,CFGGraph,MPs}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%