commit 4617d5823c8e7841fed813b3b9c72664d7fd4dc6
author Vladimir Marko <vmarko@google.com> Thu Mar 28 13:48:31 2019 +0000
committer Vladimir Marko <vmarko@google.com> Fri Mar 29 09:50:00 2019 +0000
tree 9eafbee06717e02a2c4acd5d7ce1e6601955356e
parent d7e9bbf092b5a61048358fd54183526ef12284af

ObjPtr<>-ify mirror::Object::As*(), fix stale refs in test.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 31113334
Change-Id: Ia04c4996f5cbfa1f26acbadcd747342c57b1aac3

runtime/native/java_lang_System.cc

diff --git a/runtime/native/java_lang_System.cc b/runtime/native/java_lang_System.cc
index e4bc8ce..63cbd2c 100644
--- a/runtime/native/java_lang_System.cc
+++ b/runtime/native/java_lang_System.cc
@@ -127,9 +127,9 @@
             dstPos, ObjPtr<mirror::LongArray>::DownCast(srcArray), srcPos, count);
         return;
       case Primitive::kPrimNot: {
-        mirror::ObjectArray<mirror::Object>* dstObjArray =
+        ObjPtr<mirror::ObjectArray<mirror::Object>> dstObjArray =
             dstArray->AsObjectArray<mirror::Object>();
-        mirror::ObjectArray<mirror::Object>* srcObjArray =
+        ObjPtr<mirror::ObjectArray<mirror::Object>> srcObjArray =
             srcArray->AsObjectArray<mirror::Object>();
         dstObjArray->AssignableMemmove(dstPos, srcObjArray, srcPos, count);
         return;