diff options
author | 2017-03-14 14:18:46 +0000 | |
---|---|---|
committer | 2017-03-14 19:03:20 +0000 | |
commit | f44d36c8423f81cbb5e9f55d8813e26ffa1a7f3b (patch) | |
tree | 324b41485ce6c414c1a006c72cbcc5ed9f466138 /runtime/native/dalvik_system_VMRuntime.cc | |
parent | 8d6768d47b66a688d35399d524ad5a5450e9d9d4 (diff) |
Revert^2 "Hash-based DexCache field array."
Test: testrunner.py --host --interpreter
Bug: 30627598
This reverts commit 6374c58f2ea403b3a05fb27376110fe4d0fc8e3f.
Change-Id: I275508e288a85d3aa08f7405a1a4f362af43b775
Diffstat (limited to 'runtime/native/dalvik_system_VMRuntime.cc')
-rw-r--r-- | runtime/native/dalvik_system_VMRuntime.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc index 9b707f8e1c..d81c13df11 100644 --- a/runtime/native/dalvik_system_VMRuntime.cc +++ b/runtime/native/dalvik_system_VMRuntime.cc @@ -444,6 +444,7 @@ static void PreloadDexCachesStatsFilled(DexCacheStats* filled) if (!kPreloadDexCachesCollectStats) { return; } + // TODO: Update for hash-based DexCache arrays. ClassLinker* const class_linker = Runtime::Current()->GetClassLinker(); Thread* const self = Thread::Current(); for (const DexFile* dex_file : class_linker->GetBootClassPath()) { @@ -463,7 +464,7 @@ static void PreloadDexCachesStatsFilled(DexCacheStats* filled) } } for (size_t j = 0; j < dex_cache->NumResolvedFields(); j++) { - ArtField* field = class_linker->GetResolvedField(j, dex_cache); + ArtField* field = dex_cache->GetResolvedField(j, class_linker->GetImagePointerSize()); if (field != nullptr) { filled->num_fields++; } |