diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-07-08 09:41:54 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-07-08 09:41:54 +0000 |
| commit | 7070ccd8b6439477eafeea7ed3736645d78e003f (patch) | |
| tree | e32dca6b4342ce7b42952e0d9150a85fba361562 /patchoat | |
| parent | fa2c054b28d4b540c1b3651401a7a091282a015f (diff) | |
| download | art-7070ccd8b6439477eafeea7ed3736645d78e003f.tar.gz art-7070ccd8b6439477eafeea7ed3736645d78e003f.tar.bz2 art-7070ccd8b6439477eafeea7ed3736645d78e003f.zip | |
Revert "Remove interpreter entrypoint in ArtMethod."
Build failures on bots. Investigating.
This reverts commit fa2c054b28d4b540c1b3651401a7a091282a015f.
Change-Id: Id65b2009aa66cb291fb8c39758a58e0b0d22616c
Diffstat (limited to 'patchoat')
| -rw-r--r-- | patchoat/patchoat.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc index 687ebe817b..04017273a8 100644 --- a/patchoat/patchoat.cc +++ b/patchoat/patchoat.cc @@ -649,6 +649,8 @@ void PatchOat::FixupMethod(ArtMethod* object, ArtMethod* copy) { copy->SetDexCacheResolvedTypes(RelocatedAddressOfPointer(object->GetDexCacheResolvedTypes())); copy->SetEntryPointFromQuickCompiledCodePtrSize(RelocatedAddressOfPointer( object->GetEntryPointFromQuickCompiledCodePtrSize(pointer_size)), pointer_size); + copy->SetEntryPointFromInterpreterPtrSize(RelocatedAddressOfPointer( + object->GetEntryPointFromInterpreterPtrSize(pointer_size)), pointer_size); copy->SetEntryPointFromJniPtrSize(RelocatedAddressOfPointer( object->GetEntryPointFromJniPtrSize(pointer_size)), pointer_size); } |