diff options
| author | 2018-07-05 08:14:35 +0000 | |
|---|---|---|
| committer | 2018-07-05 13:04:43 +0100 | |
| commit | afc97bca07c85d4c3b46801c557edd12d681fc96 (patch) | |
| tree | fd53094370a28aa4ba4b9d419e05ff7797cf51ae /runtime/stack.cc | |
| parent | 564fa8a1f3e3c39793c9b146ed5f21650617dc3f (diff) | |
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
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_); |