commit a058fdf0cf7435a13a6e8cae5e3a9bfa1513828d
author Mathieu Chartier <mathieuc@google.com> Thu Oct 06 15:13:58 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Oct 06 15:53:58 2016 -0700
tree 85de1316f29f661372841d5feee16c370375fc16
parent c4f3925490a73da8dc74884a1deb965d4ecaf14e

Move mirror::Object setters to ObjPtr

Bug: 31113334

Test: test-art-host

Change-Id: I2c4c84645e194c3c435a4a6fd670176b0e98671f

runtime/mirror/object.cc

diff --git a/runtime/mirror/object.cc b/runtime/mirror/object.cc
index 90b97fd..fbb7c96 100644
--- a/runtime/mirror/object.cc
+++ b/runtime/mirror/object.cc
@@ -199,7 +199,7 @@
   UNREACHABLE();
 }
 
-void Object::CheckFieldAssignmentImpl(MemberOffset field_offset, Object* new_value) {
+void Object::CheckFieldAssignmentImpl(MemberOffset field_offset, ObjPtr<Object> new_value) {
   Class* c = GetClass();
   Runtime* runtime = Runtime::Current();
   if (runtime->GetClassLinker() == nullptr || !runtime->IsStarted() ||