commit 271743601650308c7ac5c7a3ec35025d8130a298
author Calin Juravle <calin@google.com> Mon Oct 26 12:38:43 2015 +0000
committer Calin Juravle <calin@google.com> Mon Oct 26 12:38:43 2015 +0000
tree cd75b95462144f35835a64e442541e778ea24fe7
parent 4e5dd521063beae1706410419f19c7e224db50fe

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

This reverts commit 4e5dd521063beae1706410419f19c7e224db50fe.

Change-Id: I0de261d14dd3f71abe05f9bc71744820cf23b937

compiler/optimizing/graph_visualizer.cc

diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc
index 264c94e..4111671 100644
--- a/compiler/optimizing/graph_visualizer.cc
+++ b/compiler/optimizing/graph_visualizer.cc
@@ -24,7 +24,6 @@
 #include "code_generator.h"
 #include "dead_code_elimination.h"
 #include "disassembler.h"
-#include "inliner.h"
 #include "licm.h"
 #include "nodes.h"
 #include "optimization.h"
@@ -425,6 +424,11 @@
     return strcmp(pass_name_, name) == 0;
   }
 
+  bool IsReferenceTypePropagationPass() {
+    return strstr(pass_name_, ReferenceTypePropagation::kReferenceTypePropagationPassName)
+        != nullptr;
+  }
+
   void PrintInstruction(HInstruction* instruction) {
     output_ << instruction->DebugName();
     if (instruction->InputCount() > 0) {
@@ -488,8 +492,7 @@
       } else {
         StartAttributeStream("loop") << "B" << info->GetHeader()->GetBlockId();
       }
-    } else if ((IsPass(ReferenceTypePropagation::kReferenceTypePropagationPassName)
-        || IsPass(HInliner::kInlinerPassName))
+    } else if (IsReferenceTypePropagationPass()
         && (instruction->GetType() == Primitive::kPrimNot)) {
       ReferenceTypeInfo info = instruction->IsLoadClass()
         ? instruction->AsLoadClass()->GetLoadedClassRTI()