diff options
| author | Calin Juravle <calin@google.com> | 2015-10-26 12:38:43 +0000 |
|---|---|---|
| committer | Calin Juravle <calin@google.com> | 2015-10-26 12:38:43 +0000 |
| commit | 271743601650308c7ac5c7a3ec35025d8130a298 (patch) | |
| tree | cd75b95462144f35835a64e442541e778ea24fe7 /compiler/optimizing/graph_visualizer.cc | |
| parent | 4e5dd521063beae1706410419f19c7e224db50fe (diff) | |
Revert "Run type propagation after inliner only when needed."
This reverts commit 4e5dd521063beae1706410419f19c7e224db50fe.
Change-Id: I0de261d14dd3f71abe05f9bc71744820cf23b937
Diffstat (limited to 'compiler/optimizing/graph_visualizer.cc')
| -rw-r--r-- | compiler/optimizing/graph_visualizer.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc index 264c94e938..4111671a9b 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 @@ class HGraphVisualizerPrinter : public HGraphDelegateVisitor { 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 @@ class HGraphVisualizerPrinter : public HGraphDelegateVisitor { } 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() |