hipe_rtl: drop alub dest when unused

1 files changed, 11 insertions, 11 deletions

diff --git a/lib/hipe/ssa/hipe_ssa.inc b/lib/hipe/ssa/hipe_ssa.inc
index 83ab320306..b511bb6f25 100644
--- a/lib/hipe/ssa/hipe_ssa.inc
+++ b/lib/hipe/ssa/hipe_ssa.inc
@@ -1,4 +1,4 @@
-%% -*- erlang-indent-level: 2 -*-
+%% -*- mode: erlang; erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -943,9 +943,9 @@ do_code([Instr|Instrs], LiveOut, Changed, Acc) ->
     false ->
       do_code(Instrs, LiveIn, Changed, [Instr|Acc]);
     true ->
-      case ?CODE:is_safe(Instr) of
+      case ?CODE:is_call(Instr) of
 	true ->
-	  case ?CODE:is_call(Instr) of
+	  case ?CODE:is_safe(Instr) of
 	    true ->
 	      case ?CODE:call_continuation(Instr) of
 		[] ->
@@ -955,11 +955,6 @@ do_code([Instr|Instrs], LiveOut, Changed, Acc) ->
 		  do_code(Instrs, LiveOut, true, [NewInstr|Acc])
 	      end;
 	    false ->
-	      do_code(Instrs, LiveOut, true, Acc)
-	  end;
-	false -> %% not a safe instruction - cannot be removed
-	  case ?CODE:is_call(Instr) of
-	    true ->
 	      case ?CODE:call_dstlist(Instr) of
 	        [] ->  %% result was not used anyway; no change
 		  do_code(Instrs, LiveIn, Changed, [Instr|Acc]);
@@ -968,9 +963,14 @@ do_code([Instr|Instrs], LiveOut, Changed, Acc) ->
 		  do_code(Instrs, LiveIn, true, [NewInstr|Acc]);
 		[_|_] ->  %% calls with multiple dests are left untouched
 		  do_code(Instrs, LiveIn, Changed, [Instr|Acc])
-	      end;
-	    false ->
-	      do_code(Instrs, LiveIn, Changed, [Instr|Acc])
+	      end
+	  end;
+	false ->
+	  case ?CODE:reduce_unused(Instr) of
+	    false -> % not a safe instruction - cannot be removed
+	      do_code(Instrs, LiveIn, Changed, [Instr|Acc]);
+	    Replacement ->
+	      do_code(lists:reverse(Replacement, Instrs), LiveOut, true, Acc)
 	  end
       end
   end;