diff options
| author | 2021-11-01 09:02:09 +0000 | |
|---|---|---|
| committer | 2021-11-01 10:45:06 +0000 | |
| commit | e43aa3f55fd01ce0887059b309a41b6441521e7c (patch) | |
| tree | 7ba4ef9adfbb77e6baa1891c3fabd783fb03d580 /runtime/stack_map.cc | |
| parent | 808d8cc8114e0c5ee3116639fe9d31be5a70403a (diff) | |
Revert^2 "Inline across dex files for bootclaspath's methods"
This reverts commit 8cb989f1019c4fa30845bf2deb5bc996ed4e8966, so we
are re-enabling commit d690f8ae8f8e2675bc52089a83ac18c749f8e6d2.
Reason for revert: Failing test was fixed here
https://android-review.googlesource.com/c/platform/art/+/1873567
Bug: 154012332
Test: ART tests
Change-Id: If159b29583e35abcfe753f30483f83990208b1b9
Diffstat (limited to 'runtime/stack_map.cc')
| -rw-r--r-- | runtime/stack_map.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/runtime/stack_map.cc b/runtime/stack_map.cc index c160e2b4b3..939c4b34cf 100644 --- a/runtime/stack_map.cc +++ b/runtime/stack_map.cc @@ -347,9 +347,12 @@ void InlineInfo::Dump(VariableIndentationOutputStream* vios, ScopedObjectAccess soa(Thread::Current()); vios->Stream() << ", method=" << GetArtMethod()->PrettyMethod(); } else { - vios->Stream() - << std::dec - << ", method_index=" << code_info.GetMethodIndexOf(*this); + MethodInfo method_info = code_info.GetMethodInfoOf(*this); + vios->Stream() << std::dec << ", method_index=" << method_info.GetMethodIndex(); + if (method_info.HasDexFileIndex()) { + vios->Stream() << std::dec + << ", boot_class_path_dex_file_index=" << method_info.GetDexFileIndex(); + } } vios->Stream() << ")\n"; code_info.GetInlineDexRegisterMapOf(stack_map, *this).Dump(vios); |