Merge SP1A.210604.001

Change-Id: Iccfcab55c2cc8c0bb37f4e8acd040be3a3e87059

1 files changed, 3 insertions, 2 deletions

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 {