diff options
| author | Vladimir Marko <vmarko@google.com> | 2016-12-20 16:24:13 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2017-01-30 10:21:16 +0000 |
| commit | ec7862283dd49f5a58d0ac45960ce27c2f7671b8 (patch) | |
| tree | 26d6dcc1d5ed4f0ba5ac15f17ef7377215684bf6 /patchoat | |
| parent | c01d49091f4588777db5bf45345f388058caa99f (diff) | |
| download | art-ec7862283dd49f5a58d0ac45960ce27c2f7671b8.tar.gz art-ec7862283dd49f5a58d0ac45960ce27c2f7671b8.tar.bz2 art-ec7862283dd49f5a58d0ac45960ce27c2f7671b8.zip | |
Hash-based dex cache type array.
Test: m test-art-host (Interpreter, Optimizing, JIT)
Test: m test-art-target on Nexus 6P (Interpreter, Optimizing, JIT)
Test: Nexus 6P boots
Test: m valgrind-test-art-host
Bug: 30627598
Bug: 34659969
Bug: 30419309
Change-Id: Ic00eda89e58088a3573fc9ec0ad04c0e69e161d1
Diffstat (limited to 'patchoat')
| -rw-r--r-- | patchoat/patchoat.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc index 9a73830f99..2546822613 100644 --- a/patchoat/patchoat.cc +++ b/patchoat/patchoat.cc @@ -643,8 +643,8 @@ void PatchOat::PatchDexFileArrays(mirror::ObjectArray<mirror::Object>* img_roots if (orig_strings != nullptr) { orig_dex_cache->FixupStrings(RelocatedCopyOf(orig_strings), RelocatedPointerVisitor(this)); } - GcRoot<mirror::Class>* orig_types = orig_dex_cache->GetResolvedTypes(); - GcRoot<mirror::Class>* relocated_types = RelocatedAddressOfPointer(orig_types); + mirror::TypeDexCacheType* orig_types = orig_dex_cache->GetResolvedTypes(); + mirror::TypeDexCacheType* relocated_types = RelocatedAddressOfPointer(orig_types); copy_dex_cache->SetField64<false>( mirror::DexCache::ResolvedTypesOffset(), static_cast<int64_t>(reinterpret_cast<uintptr_t>(relocated_types))); |