tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move to using ClassAccessor

Browse source 
In preparation for removal of ClassDataItemAccessor.

Bug: 79758018
Test: make
Test: test/run-test --host 137
Test: out/host/linux-x86/nativetest/libunwindstack_test/libunwindstack_test

Change-Id: I61a20fe7200a0d669b84573d3853b55877922602
This commit is contained in:
Mathieu Chartier 2018-08-07 18:12:23 -07:00
parent 1e0e1b44bd
commit c2277fc216
2 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libunwindstack/DexFile.cpp
View file

@ -24,6 +24,7 @@
#include <android-base/unique_fd.h>
#include <dex/class_accessor-inl.h>
#include <dex/code_item_accessors-inl.h>
#include <dex/compact_dex_file.h>
#include <dex/dex_file-inl.h>
@ -98,38 +99,20 @@ bool DexFile::GetMethodInformation(uint64_t dex_offset, std::string* method_name
// Check the methods we haven't cached.
for (; class_def_index_ < dex_file_->NumClassDefs(); class_def_index_++) {
const art::DexFile::ClassDef& class_def = dex_file_->GetClassDef(class_def_index_);
const uint8_t* class_data = dex_file_->GetClassData(class_def);
if (class_data == nullptr) {
continue;
}
art::ClassAccessor accessor(*dex_file_, dex_file_->GetClassDef(class_def_index_));
if (class_it_.get() == nullptr || !class_it_->HasNext()) {
class_it_.reset(new art::ClassDataItemIterator(*dex_file_.get(), class_data));
}
for (; class_it_->HasNext(); class_it_->Next()) {
if (!class_it_->IsAtMethod()) {
continue;
}
const art::DexFile::CodeItem* code_item = class_it_->GetMethodCodeItem();
if (code_item == nullptr) {
continue;
}
art::CodeItemInstructionAccessor code(*dex_file_.get(), code_item);
for (const art::ClassAccessor::Method& method : accessor.GetMethods()) {
art::CodeItemInstructionAccessor code = method.GetInstructions();
if (!code.HasCodeItem()) {
continue;
}
uint32_t offset = reinterpret_cast<const uint8_t*>(code.Insns()) - dex_file_->Begin();
uint32_t offset_end = offset + code.InsnsSizeInCodeUnits() * sizeof(uint16_t);
uint32_t member_index = class_it_->GetMemberIndex();
uint32_t offset_end = offset + code.InsnsSizeInBytes();
uint32_t member_index = method.GetIndex();
method_cache_[offset_end] = std::make_pair(offset, member_index);
if (offset <= dex_offset && dex_offset < offset_end) {
*method_name = dex_file_->PrettyMethod(member_index, false);
*method_offset = dex_offset - offset;
// Move past this element.
class_it_->Next();
return true;
}
}

1
libunwindstack/DexFile.h
View file

@ -45,7 +45,6 @@ class DexFile {
std::map<uint32_t, std::pair<uint64_t, uint32_t>> method_cache_; // dex offset to method index.
uint32_t class_def_index_ = 0;
std::unique_ptr<art::ClassDataItemIterator> class_it_;
};
class DexFileFromFile : public DexFile {