diff options
| author | Calin Juravle <calin@google.com> | 2015-10-26 12:39:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-26 12:39:04 +0000 |
| commit | 1839d3c7557a48358dcdb78934aac8f62d0916bc (patch) | |
| tree | 983e7803dbb3c3362f4bedfb81d2f3fb47744a3b /compiler/optimizing/graph_visualizer.cc | |
| parent | 605f27d8719c8238679038b452b4665f47a6916a (diff) | |
| parent | 271743601650308c7ac5c7a3ec35025d8130a298 (diff) | |
Merge "Revert "Run type propagation after inliner only when needed.""
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() |