diff options
| author | 2016-06-02 11:48:30 -0700 | |
|---|---|---|
| committer | 2016-06-03 12:45:04 -0700 | |
| commit | d6d49e56c2b7b11f474acb80cb02bb1fe9b7861e (patch) | |
| tree | b6df3e71798c9a547e56dcbe7d7b7a6f3dc003a2 /runtime/native/dalvik_system_VMRuntime.cc | |
| parent | b089eccf503646e6ed2d5bb20d973d9131166655 (diff) | |
Hold dex caches live in class table
Prevents temporary dex caches being unloaded for the same dex file.
Usually this is OK, but if someone resolved a string in that dex
cache, it could leave stale pointers in BSS. Also it can use extra
memory in linear alloc if we allocate dex cache arrays multiple
times.
Bug: 29083330
(cherry picked from commit f284d448e3edd428b6ade473d0993028638b2064)
Change-Id: Ie1b0b0cf835a998e19227cbb90014011a6cd40c4
Diffstat (limited to 'runtime/native/dalvik_system_VMRuntime.cc')
| -rw-r--r-- | runtime/native/dalvik_system_VMRuntime.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc index 56c0d58e69..759d6fa333 100644 --- a/runtime/native/dalvik_system_VMRuntime.cc +++ b/runtime/native/dalvik_system_VMRuntime.cc @@ -504,8 +504,7 @@ static void VMRuntime_preloadDexCaches(JNIEnv* env, jobject) { const DexFile* dex_file = boot_class_path[i]; CHECK(dex_file != nullptr); StackHandleScope<1> hs(soa.Self()); - Handle<mirror::DexCache> dex_cache( - hs.NewHandle(linker->RegisterDexFile(*dex_file, runtime->GetLinearAlloc()))); + Handle<mirror::DexCache> dex_cache(hs.NewHandle(linker->RegisterDexFile(*dex_file, nullptr))); if (kPreloadDexCachesStrings) { for (size_t j = 0; j < dex_cache->NumStrings(); j++) { |