diff options
| author | Andreas Gampe <agampe@google.com> | 2015-05-27 22:41:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-27 22:41:31 +0000 |
| commit | 33d75bc75c72db7e5b1ea4ad0be287b1dfd72e69 (patch) | |
| tree | f2bdf02aba34e7d59c760df1b54bb3c789ee6648 /patchoat | |
| parent | 65efe9192390187674108b9c895ba225628bb07b (diff) | |
| parent | 3b45ef277e4a5f7e0314d5df7ef82e480156ba75 (diff) | |
| download | android_art-33d75bc75c72db7e5b1ea4ad0be287b1dfd72e69.tar.gz android_art-33d75bc75c72db7e5b1ea4ad0be287b1dfd72e69.tar.bz2 android_art-33d75bc75c72db7e5b1ea4ad0be287b1dfd72e69.zip | |
Merge "ART: Fix VerifyObject runtime verification"
Diffstat (limited to 'patchoat')
| -rw-r--r-- | patchoat/patchoat.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc index ef84a1717c..8db1d2398f 100644 --- a/patchoat/patchoat.cc +++ b/patchoat/patchoat.cc @@ -563,21 +563,21 @@ void PatchOat::FixupMethod(mirror::ArtMethod* object, mirror::ArtMethod* copy) { uintptr_t quick= reinterpret_cast<uintptr_t>( object->GetEntryPointFromQuickCompiledCodePtrSize<kVerifyNone>(pointer_size)); if (quick != 0) { - copy->SetEntryPointFromQuickCompiledCodePtrSize(reinterpret_cast<void*>(quick + delta_), - pointer_size); + copy->SetEntryPointFromQuickCompiledCodePtrSize<kVerifyNone>( + reinterpret_cast<void*>(quick + delta_), pointer_size); } uintptr_t interpreter = reinterpret_cast<uintptr_t>( object->GetEntryPointFromInterpreterPtrSize<kVerifyNone>(pointer_size)); if (interpreter != 0) { - copy->SetEntryPointFromInterpreterPtrSize( + copy->SetEntryPointFromInterpreterPtrSize<kVerifyNone>( reinterpret_cast<mirror::EntryPointFromInterpreter*>(interpreter + delta_), pointer_size); } uintptr_t native_method = reinterpret_cast<uintptr_t>( object->GetEntryPointFromJniPtrSize(pointer_size)); if (native_method != 0) { - copy->SetEntryPointFromJniPtrSize(reinterpret_cast<void*>(native_method + delta_), - pointer_size); + copy->SetEntryPointFromJniPtrSize<kVerifyNone>( + reinterpret_cast<void*>(native_method + delta_), pointer_size); } } |