diff options
Diffstat (limited to 'runtime/stack.cc')
| -rw-r--r-- | runtime/stack.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/stack.cc b/runtime/stack.cc index 2fb8c413e9..e99cb1b9fa 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -814,7 +814,10 @@ void StackVisitor::WalkStack(bool include_transitions) { if ((walk_kind_ == StackWalkKind::kIncludeInlinedFrames) && (cur_oat_quick_method_header_ != nullptr) - && cur_oat_quick_method_header_->IsOptimized()) { + && cur_oat_quick_method_header_->IsOptimized() + // JNI methods cannot have any inlined frames. + && !method->IsNative()) { + DCHECK_NE(cur_quick_frame_pc_, 0u); CodeInfo code_info(cur_oat_quick_method_header_); uint32_t native_pc_offset = cur_oat_quick_method_header_->NativeQuickPcOffset(cur_quick_frame_pc_); |