From dac82393785d1d2fddae6bf6d8364b55b001925a Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Mon, 10 May 2021 15:44:24 +0000 Subject: Fix array location aliasing checks in LSE. Test: New tests in load_store_elimination_test. Test: New test in 539-checker-lse. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Bug: 187487955 Change-Id: Iff66d5406cf1b36c3bebbce1d48117f83bb50553 --- compiler/optimizing/graph_visualizer.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'compiler/optimizing/graph_visualizer.cc') diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc index 5a264b7a70..716fee4d3e 100644 --- a/compiler/optimizing/graph_visualizer.cc +++ b/compiler/optimizing/graph_visualizer.cc @@ -656,9 +656,10 @@ class HGraphVisualizerPrinter : public HGraphDelegateVisitor { } else { StartAttributeStream("dex_pc") << "n/a"; } + HBasicBlock* block = instruction->GetBlock(); if (IsPass(kDebugDumpName)) { // Include block name for logcat use. - StartAttributeStream("block") << namer_.GetName(instruction->GetBlock()); + StartAttributeStream("block") << namer_.GetName(block); } instruction->Accept(this); if (instruction->HasEnvironment()) { @@ -710,7 +711,7 @@ class HGraphVisualizerPrinter : public HGraphDelegateVisitor { } } - HLoopInformation* loop_info = instruction->GetBlock()->GetLoopInformation(); + HLoopInformation* loop_info = (block != nullptr) ? block->GetLoopInformation() : nullptr; if (loop_info == nullptr) { StartAttributeStream("loop") << "none"; } else { -- cgit v1.2.3