diff options
| author | 2018-07-20 13:06:30 +0000 | |
|---|---|---|
| committer | 2018-07-20 13:06:30 +0000 | |
| commit | b07dcdba37e9a5652b7754a6bd9c3538880d6668 (patch) | |
| tree | 15524fb0505323ec78bf4d8841245da6fe61d6ee /patchoat/patchoat.cc | |
| parent | 6250dfa22577160b270f3f3165260739707cf7d3 (diff) | |
| parent | c945e0d410ca8d4e9ba09272e8727a3192f1e449 (diff) | |
Merge changes I87f2999f,I8af0e845
* changes:
Remove ArtMethod's declaring class state checks.
ObjPtr<>-ify ArtMethod and mirror::Method.
Diffstat (limited to 'patchoat/patchoat.cc')
| -rw-r--r-- | patchoat/patchoat.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc index cb776bf914..fb42fb4d7c 100644 --- a/patchoat/patchoat.cc +++ b/patchoat/patchoat.cc @@ -1072,7 +1072,7 @@ void PatchOat::FixupMethod(ArtMethod* object, ArtMethod* copy) { copy->CopyFrom(object, pointer_size); // Just update the entry points if it looks like we should. // TODO: sanity check all the pointers' values - copy->SetDeclaringClass(RelocatedAddressOfPointer(object->GetDeclaringClass())); + copy->SetDeclaringClass(RelocatedAddressOfPointer(object->GetDeclaringClass().Ptr())); copy->SetEntryPointFromQuickCompiledCodePtrSize(RelocatedAddressOfPointer( object->GetEntryPointFromQuickCompiledCodePtrSize(pointer_size)), pointer_size); // No special handling for IMT conflict table since all pointers are moved by the same offset. |