Merge "Revert "Run type propagation after inliner only when needed.""

1 files changed, 12 insertions, 2 deletions

diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index ec9b4d9797..d6f2543890 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -390,9 +390,19 @@ static void MaybeRunInliner(HGraph* graph,
     return;
   }
 
-  HInliner* inliner = new (graph->GetArena()) HInliner(
+  ArenaAllocator* arena = graph->GetArena();
+  HInliner* inliner = new (arena) HInliner(
     graph, dex_compilation_unit, dex_compilation_unit, driver, handles, stats);
-  HOptimization* optimizations[] = { inliner };
+  ReferenceTypePropagation* type_propagation =
+    new (arena) ReferenceTypePropagation(graph, handles,
+        "reference_type_propagation_after_inlining");
+
+  HOptimization* optimizations[] = {
+    inliner,
+    // Run another type propagation phase: inlining will open up more opportunities
+    // to remove checkcast/instanceof and null checks.
+    type_propagation,
+  };
 
   RunOptimizations(optimizations, arraysize(optimizations), pass_observer);
 }