From 1dd292be0d0eea800f4c92f536388c4ab1eeee53 Mon Sep 17 00:00:00 2001 From: Santiago Aboy Solanes Date: Tue, 29 Nov 2022 14:09:43 +0000 Subject: Move the try_start dump property to 'flags' Fix our .cfgs crashing when being loaded in some visualizer tools. We can move try_start to the flags properties, since a block may be a catch block or a try block but never both. Test: Dump a cfg and load it with c1visualizer Change-Id: Ic3e025224087ce3d9180c169da8729a824b74d85 --- compiler/optimizing/graph_visualizer.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'compiler/optimizing/graph_visualizer.cc') diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc index 2de9446c78..646c34e384 100644 --- a/compiler/optimizing/graph_visualizer.cc +++ b/compiler/optimizing/graph_visualizer.cc @@ -904,15 +904,16 @@ class HGraphVisualizerPrinter : public HGraphDelegateVisitor { if (block->IsCatchBlock()) { PrintProperty("flags", "catch_block"); + } else if (block->IsTryBlock()) { + std::stringstream flags_properties; + flags_properties << "try_start " + << namer_.GetName(block->GetTryCatchInformation()->GetTryEntry().GetBlock()); + PrintProperty("flags", flags_properties.str().c_str()); } else if (!IsDebugDump()) { // Don't print useless information to logcat PrintEmptyProperty("flags"); } - if (block->IsTryBlock()) { - PrintProperty("try_start", block->GetTryCatchInformation()->GetTryEntry().GetBlock()); - } - if (block->GetDominator() != nullptr) { PrintProperty("dominator", block->GetDominator()); } -- cgit v1.2.3-59-g8ed1b