summaryrefslogtreecommitdiff
path: root/runtime/native/java_lang_System.cc
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2019-03-28 13:48:31 +0000
committer Vladimir Marko <vmarko@google.com> 2019-03-29 09:50:00 +0000
commit4617d5823c8e7841fed813b3b9c72664d7fd4dc6 (patch)
tree9eafbee06717e02a2c4acd5d7ce1e6601955356e /runtime/native/java_lang_System.cc
parentd7e9bbf092b5a61048358fd54183526ef12284af (diff)
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
Diffstat (limited to 'runtime/native/java_lang_System.cc')
-rw-r--r--runtime/native/java_lang_System.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/native/java_lang_System.cc b/runtime/native/java_lang_System.cc
index e4bc8ce5a2..63cbd2c815 100644
--- a/runtime/native/java_lang_System.cc
+++ b/runtime/native/java_lang_System.cc
@@ -127,9 +127,9 @@ static void System_arraycopy(JNIEnv* env, jclass, jobject javaSrc, jint srcPos,
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;