diff options
Diffstat (limited to 'compiler/optimizing/graph_visualizer.cc')
| -rw-r--r-- | compiler/optimizing/graph_visualizer.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc index c41574c93c..504c141799 100644 --- a/compiler/optimizing/graph_visualizer.cc +++ b/compiler/optimizing/graph_visualizer.cc @@ -152,7 +152,7 @@ class HGraphVisualizerDisassembler { /** * HGraph visitor to generate a file suitable for the c1visualizer tool and IRHydra. */ -class HGraphVisualizerPrinter : public HGraphVisitor { +class HGraphVisualizerPrinter : public HGraphDelegateVisitor { public: HGraphVisualizerPrinter(HGraph* graph, std::ostream& output, @@ -160,7 +160,7 @@ class HGraphVisualizerPrinter : public HGraphVisitor { bool is_after_pass, const CodeGenerator& codegen, const DisassemblyInformation* disasm_info = nullptr) - : HGraphVisitor(graph), + : HGraphDelegateVisitor(graph), output_(output), pass_name_(pass_name), is_after_pass_(is_after_pass), @@ -372,20 +372,21 @@ class HGraphVisualizerPrinter : public HGraphVisitor { << instance_of->MustDoNullCheck() << std::noboolalpha; } - void VisitInvokeStaticOrDirect(HInvokeStaticOrDirect* invoke) OVERRIDE { + void VisitInvoke(HInvoke* invoke) OVERRIDE { StartAttributeStream("dex_file_index") << invoke->GetDexMethodIndex(); + StartAttributeStream("method_name") << PrettyMethod( + invoke->GetDexMethodIndex(), GetGraph()->GetDexFile(), /* with_signature */ false); + } + + void VisitInvokeStaticOrDirect(HInvokeStaticOrDirect* invoke) OVERRIDE { + VisitInvoke(invoke); StartAttributeStream("recursive") << std::boolalpha << invoke->IsRecursive() << std::noboolalpha; } void VisitTryBoundary(HTryBoundary* try_boundary) OVERRIDE { - StartAttributeStream("is_entry") << std::boolalpha - << try_boundary->IsTryEntry() - << std::noboolalpha; - StartAttributeStream("is_exit") << std::boolalpha - << try_boundary->IsTryExit() - << std::noboolalpha; + StartAttributeStream("kind") << (try_boundary->IsEntry() ? "entry" : "exit"); } bool IsPass(const char* name) { |