From 4617d5823c8e7841fed813b3b9c72664d7fd4dc6 Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Thu, 28 Mar 2019 13:48:31 +0000
Subject: 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/class_loader_context.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/class_loader_context.cc')

diff --git a/runtime/class_loader_context.cc b/runtime/class_loader_context.cc
index e890c1f66b..66d134e7ee 100644
--- a/runtime/class_loader_context.cc
+++ b/runtime/class_loader_context.cc
@@ -865,7 +865,7 @@ static bool CollectDexFilesFromJavaDexFile(ObjPtr<mirror::Object> java_dex_file,
     return true;
   }
   // On the Java side, the dex files are stored in the cookie field.
-  mirror::LongArray* long_array = cookie_field->GetObject(java_dex_file)->AsLongArray();
+  ObjPtr<mirror::LongArray> long_array = cookie_field->GetObject(java_dex_file)->AsLongArray();
   if (long_array == nullptr) {
     // This should never happen so log a warning.
     LOG(ERROR) << "Unexpected null cookie";
-- 
cgit v1.2.3-59-g8ed1b