diff options
| author | 2016-09-30 10:27:43 -0700 | |
|---|---|---|
| committer | 2016-10-03 14:06:27 -0700 | |
| commit | 3398c7874e002beaa6c2b2fadf183e7d1ddad23a (patch) | |
| tree | 7db754b5b0c3a6c68bc1f91d7cb2477f534d2ad3 /patchoat/patchoat.cc | |
| parent | 462e21cc8d28a4d48342cf0f634bd1ecc63647d7 (diff) | |
Move ArtField to ObjPtr
Added EXPECT_OBJ_PTR_EQ and variants to gtests.
Fixed moving GC bugs in:
ClassLinker::CreatePathClassLoader
ClassLinkerTest: StaticFields
ObjPtr Decode call sites: 186 -> 181.
Some tests fail due to ResolvedFieldAccessTest, will fix in follow
up CL.
Bug: 31113334
Test: test-art-host CC baker
Change-Id: I8b266ad00f3c20c8cbe7cfdf280d175083df0b88
Diffstat (limited to 'patchoat/patchoat.cc')
| -rw-r--r-- | patchoat/patchoat.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc index d58f38cc06..b259f64d1e 100644 --- a/patchoat/patchoat.cc +++ b/patchoat/patchoat.cc @@ -504,7 +504,8 @@ class PatchOatArtFieldVisitor : public ArtFieldVisitor { void Visit(ArtField* field) OVERRIDE REQUIRES_SHARED(Locks::mutator_lock_) { ArtField* const dest = patch_oat_->RelocatedCopyOf(field); - dest->SetDeclaringClass(patch_oat_->RelocatedAddressOfPointer(field->GetDeclaringClass())); + dest->SetDeclaringClass( + patch_oat_->RelocatedAddressOfPointer(field->GetDeclaringClass().Decode())); } private: |