commit 670b0a7f7b2b4155cf384d94f778cab58eb3d201
author David Srbecky <dsrbecky@google.com> Fri May 27 15:02:45 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 27 15:02:45 2022 +0000
tree 0cb3dc2bcc320b8ae05ac8092f949ef40528c496
parent b9b7aad7c75664823bf246cefb9cf7aa3045b05c
parent 03c4b5f9b59aa28c689ede9908005376da7d881c

Add more verbose log message when stack map isn't found. am: 92d5a61af7 am: 1bb79ffc74 am: cbc4899b17 am: 721ac5ad4d am: 03c4b5f9b5

Original change: https://android-review.googlesource.com/c/platform/art/+/2104926

Change-Id: I58967c8e4376438e74e25675392a5af5f337653c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

runtime/stack.cc

diff --git a/runtime/stack.cc b/runtime/stack.cc
index 33d3668..a6a5165 100644
--- a/runtime/stack.cc
+++ b/runtime/stack.cc
@@ -129,7 +129,7 @@
           GetCurrentQuickFrame(), cur_quick_frame_pc_, abort_on_failure);
     } else if (cur_oat_quick_method_header_->IsOptimized()) {
       StackMap* stack_map = GetCurrentStackMap();
-      DCHECK(stack_map->IsValid());
+      CHECK(stack_map->IsValid()) << "StackMap not found for " << std::hex << cur_quick_frame_pc_;
       return stack_map->GetDexPc();
     } else {
       DCHECK(cur_oat_quick_method_header_->IsNterpMethodHeader());