summaryrefslogtreecommitdiff
path: root/patchoat/patchoat.cc
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2016-10-03 18:01:28 -0700
committer Mathieu Chartier <mathieuc@google.com> 2016-10-04 10:46:16 -0700
commit1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 (patch)
tree718e322f3d05ac095770d4dc2a68b824bf3974a7 /patchoat/patchoat.cc
parent82d4838d6bb3480cd25327cedc5179fb2d86881c (diff)
Rename ObjPtr::Decode to ObjPtr::Ptr
Done to prevent ambiguity with ScopedObjectAccess::Decode. Bug: 31113334 Test: test-art-host Change-Id: I07a2497cc9cf66386311798933547471987fc316
Diffstat (limited to 'patchoat/patchoat.cc')
-rw-r--r--patchoat/patchoat.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc
index b259f64d1e..f3eb663cb8 100644
--- a/patchoat/patchoat.cc
+++ b/patchoat/patchoat.cc
@@ -505,7 +505,7 @@ 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().Decode()));
+ patch_oat_->RelocatedAddressOfPointer(field->GetDeclaringClass().Ptr()));
}
private: