Merge "Run DeadCodeRemover only one time" into ub-jack

1 files changed, 1 insertions, 10 deletions

diff --git a/dx/src/com/android/jack/dx/ssa/Optimizer.java b/dx/src/com/android/jack/dx/ssa/Optimizer.java
index 7101be0..c690fd7 100644
--- a/dx/src/com/android/jack/dx/ssa/Optimizer.java
+++ b/dx/src/com/android/jack/dx/ssa/Optimizer.java
@@ -147,30 +147,21 @@ public class Optimizer {
   }
 
   private static void runSsaFormSteps(SsaMethod ssaMeth, EnumSet<OptionalStep> steps) {
-    boolean needsDeadCodeRemover = true;
 
     if (steps.contains(OptionalStep.SCCP)) {
       SCCP.process(ssaMeth);
-      DeadCodeRemover.process(ssaMeth);
-      needsDeadCodeRemover = false;
     }
 
     if (steps.contains(OptionalStep.LITERAL_UPGRADE)) {
       LiteralOpUpgrader.process(ssaMeth);
-      DeadCodeRemover.process(ssaMeth);
-      needsDeadCodeRemover = false;
     }
 
     if (steps.contains(OptionalStep.CONST_COLLECTOR)) {
       ConstCollector.process(ssaMeth);
-      DeadCodeRemover.process(ssaMeth);
-      needsDeadCodeRemover = false;
     }
 
     // dead code remover must be run before phi type resolver
-    if (needsDeadCodeRemover) {
-      DeadCodeRemover.process(ssaMeth);
-    }
+    DeadCodeRemover.process(ssaMeth);
 
     PhiTypeResolver.process(ssaMeth);
   }