From 842acd492f8916eb56dedd17bf812107b3ffc9db Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 1 Jul 2015 13:00:15 +0100 Subject: Emit method name at invokes in the graph visualizer. Change-Id: I832f823463569724fca9c38cd70d9dd552f15b3a --- compiler/optimizing/graph_visualizer.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'compiler/optimizing/graph_visualizer.cc') diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc index c41574c93c..da3b6ae25b 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,8 +372,14 @@ 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()); + } + + void VisitInvokeStaticOrDirect(HInvokeStaticOrDirect* invoke) OVERRIDE { + VisitInvoke(invoke); StartAttributeStream("recursive") << std::boolalpha << invoke->IsRecursive() << std::noboolalpha; -- cgit v1.2.3