diff options
| author | 2017-02-14 05:40:45 +0000 | |
|---|---|---|
| committer | 2017-02-14 05:40:46 +0000 | |
| commit | df5492c5e1a75a399a2de7bf5d68d0b0aa33c293 (patch) | |
| tree | 7e87fa894090a6b1d8cf0c0b87776bc606725fee /patchoat/patchoat.cc | |
| parent | 1f38f99e3eeed84b49d54762713dec613271b809 (diff) | |
| parent | 5812e20ff7cbc8efa0b8d7486ada2f58840a6ad5 (diff) | |
Merge "Revert^3 "Hash-based dex cache type array.""
Diffstat (limited to 'patchoat/patchoat.cc')
| -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 2546822613..9a73830f99 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)); } - mirror::TypeDexCacheType* orig_types = orig_dex_cache->GetResolvedTypes(); - mirror::TypeDexCacheType* relocated_types = RelocatedAddressOfPointer(orig_types); + GcRoot<mirror::Class>* orig_types = orig_dex_cache->GetResolvedTypes(); + GcRoot<mirror::Class>* relocated_types = RelocatedAddressOfPointer(orig_types); copy_dex_cache->SetField64<false>( mirror::DexCache::ResolvedTypesOffset(), static_cast<int64_t>(reinterpret_cast<uintptr_t>(relocated_types))); |