diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-19 10:00:45 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-19 10:00:45 +0000 |
| commit | 2b57316b43fc9c091906e552c6a66c6ab8ec0812 (patch) | |
| tree | 2bc6c2f0f7f56473af073d809567145a50f81446 /compiler/optimizing/graph_visualizer.cc | |
| parent | 7a082ca7e56d203042069ea656a846ace19c76c5 (diff) | |
| parent | 1047c0335892951ca46f8cbcadb08ddd88619d1b (diff) | |
Snap for 7473492 from 1047c0335892951ca46f8cbcadb08ddd88619d1b to s-keystone-qcom-release
Change-Id: Id203e430bc26dfe5e230ac3b87a448b28aaf7c53
Diffstat (limited to 'compiler/optimizing/graph_visualizer.cc')
| -rw-r--r-- | compiler/optimizing/graph_visualizer.cc | 5 |
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 { |