diff options
| author | 2015-10-29 22:33:20 +0000 | |
|---|---|---|
| committer | 2015-10-29 22:33:20 +0000 | |
| commit | c7534d1f650a9179e204c16a2ac5b16f7257cd5c (patch) | |
| tree | f8facbd68dabc781cc4f8e76353a418ef633896e /compiler | |
| parent | b8f6d7c3360180174276bab7618760724500d148 (diff) | |
| parent | 8cb0bc28b1161dad0d2c2c1e75318b7e504faa46 (diff) | |
Merge "Change a few places to use string version of GetTypeId"
am: 8cb0bc28b1
* commit '8cb0bc28b1161dad0d2c2c1e75318b7e504faa46':
Change a few places to use string version of GetTypeId
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/quick/dex_file_method_inliner.cc | 9 | ||||
| -rw-r--r-- | compiler/driver/compiler_driver-inl.h | 14 |
2 files changed, 6 insertions, 17 deletions
diff --git a/compiler/dex/quick/dex_file_method_inliner.cc b/compiler/dex/quick/dex_file_method_inliner.cc index e1a2838f3e..eaf2408763 100644 --- a/compiler/dex/quick/dex_file_method_inliner.cc +++ b/compiler/dex/quick/dex_file_method_inliner.cc @@ -756,14 +756,7 @@ uint32_t DexFileMethodInliner::FindClassIndex(const DexFile* dex_file, IndexCach return *class_index; } - const DexFile::StringId* string_id = dex_file->FindStringId(kClassCacheNames[index]); - if (string_id == nullptr) { - *class_index = kIndexNotFound; - return *class_index; - } - uint32_t string_index = dex_file->GetIndexForStringId(*string_id); - - const DexFile::TypeId* type_id = dex_file->FindTypeId(string_index); + const DexFile::TypeId* type_id = dex_file->FindTypeId(kClassCacheNames[index]); if (type_id == nullptr) { *class_index = kIndexNotFound; return *class_index; diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h index 1a7dbe3a9f..14ba81d193 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -187,15 +187,11 @@ inline std::pair<bool, bool> CompilerDriver::IsClassOfStaticMemberAvailableToRef // Search dex file for localized ssb index, may fail if member's class is a parent // of the class mentioned in the dex file and there is no dex cache entry. std::string temp; - const DexFile::StringId* string_id = - dex_file->FindStringId(resolved_member->GetDeclaringClass()->GetDescriptor(&temp)); - if (string_id != nullptr) { - const DexFile::TypeId* type_id = - dex_file->FindTypeId(dex_file->GetIndexForStringId(*string_id)); - if (type_id != nullptr) { - // medium path, needs check of static storage base being initialized - storage_idx = dex_file->GetIndexForTypeId(*type_id); - } + const DexFile::TypeId* type_id = + dex_file->FindTypeId(resolved_member->GetDeclaringClass()->GetDescriptor(&temp)); + if (type_id != nullptr) { + // medium path, needs check of static storage base being initialized + storage_idx = dex_file->GetIndexForTypeId(*type_id); } } if (storage_idx != DexFile::kDexNoIndex) { |