diff options
| author | 2018-07-18 10:58:13 +0100 | |
|---|---|---|
| committer | 2018-07-19 16:04:38 +0100 | |
| commit | d93e374e273dd45f5d829399da1d4201bf46057e (patch) | |
| tree | 280dc72b2aec4696bbc35ad39ca8d3479107380e /patchoat/patchoat.cc | |
| parent | 7f7f9d3991f3a55da8934a3b72890d4776373598 (diff) | |
ObjPtr<>-ify ArtMethod and mirror::Method.
And clean up some forgotten things after old CLs.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 31113334
Change-Id: I8af0e845c24d674d0efab21d80c29949b1cc0593
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 97b315e85c..9b9cfbaf90 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. |