From cef72a67be590b6531802f313d6a3d97cda213fb Mon Sep 17 00:00:00 2001 From: Santiago Aboy Solanes Date: Wed, 6 Apr 2022 14:13:18 +0000 Subject: Revert^2 "DCE SimplifyAlwaysThrowing optimizations" This reverts commit 026a662dd6bef3e0e5a58478b764c4ddf662a5ec. Reason for revert: after aosp/2055933 the inliner will return true if it analyzed a method as "always throwing". This CL now uses `after_inliner` instead of `after_gvn` and shouldn't make the LUCI bots red. Bug: 227316307 Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b Change-Id: Icbc2678633c289ae6d066185e9b16e9c3674c8d0 --- compiler/optimizing/graph_visualizer.cc | 10 ++++++---- 1 file changed, 6 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 716fee4d3e..4a6ee13005 100644 --- a/compiler/optimizing/graph_visualizer.cc +++ b/compiler/optimizing/graph_visualizer.cc @@ -586,6 +586,10 @@ class HGraphVisualizerPrinter : public HGraphDelegateVisitor { StartAttributeStream("kind") << (try_boundary->IsEntry() ? "entry" : "exit"); } + void VisitGoto(HGoto* instruction) override { + StartAttributeStream("target") << namer_.GetName(instruction->GetBlock()->GetSingleSuccessor()); + } + void VisitDeoptimize(HDeoptimize* deoptimize) override { StartAttributeStream("kind") << deoptimize->GetKind(); } @@ -657,10 +661,8 @@ class HGraphVisualizerPrinter : public HGraphDelegateVisitor { StartAttributeStream("dex_pc") << "n/a"; } HBasicBlock* block = instruction->GetBlock(); - if (IsPass(kDebugDumpName)) { - // Include block name for logcat use. - StartAttributeStream("block") << namer_.GetName(block); - } + StartAttributeStream("block") << namer_.GetName(block); + instruction->Accept(this); if (instruction->HasEnvironment()) { StringList envs; -- cgit v1.2.3-59-g8ed1b