From afc97bca07c85d4c3b46801c557edd12d681fc96 Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Thu, 5 Jul 2018 08:14:35 +0000 Subject: Revert^2 "Add CodeInfo to JNI methods." It has no stack maps. We only store the frame info there. As a consequence of having CodeInfo, the JNI methods are now classified as IsOptimized(). This does not have any real effect on .oat file size. This reverts commit 564fa8a1f3e3c39793c9b146ed5f21650617dc3f. Test: test-art-host-gtest Test: test-art-target-gtest-jni_compiler_test32 Change-Id: Ic7a1949027d89ba97cfedfc8ea453f041193b6a7 --- runtime/stack.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'runtime/stack.cc') 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_); -- cgit v1.2.3-59-g8ed1b