commit e9987b0831403858d95bdd7a5ef9e56665a9702d
author Vladimir Marko <vmarko@google.com> Tue May 22 16:26:43 2018 +0100
committer Vladimir Marko <vmarko@google.com> Wed May 23 15:16:45 2018 +0100
tree 3950da94b73665a52eb5e2b9c5aecc8c92145f13
parent 6ec2a1bf1cbecf17546df780dd0ad769042e1874

ObjPtr<>-ify tests using ClassLinker::FindClass().

ClassLinker::FindClass() returns a non-ObjPtr<> reference
but it has a lot of uses, so we shall change the uses in
a few steps. This change deals with several tests.

Test: Rely on TreeHugger.
Bug: 31113334
Change-Id: Ib75e20e7ebaff01fb607a09f96675f8cf397ae52

runtime/proxy_test.h

diff --git a/runtime/proxy_test.h b/runtime/proxy_test.h
index b559823..9836264 100644
--- a/runtime/proxy_test.h
+++ b/runtime/proxy_test.h
@@ -37,7 +37,9 @@
                                   const char* className,
                                   const std::vector<mirror::Class*>& interfaces)
     REQUIRES_SHARED(Locks::mutator_lock_) {
-  mirror::Class* javaLangObject = class_linker->FindSystemClass(soa.Self(), "Ljava/lang/Object;");
+  StackHandleScope<1> hs(soa.Self());
+  Handle<mirror::Class> javaLangObject = hs.NewHandle(
+      class_linker->FindSystemClass(soa.Self(), "Ljava/lang/Object;"));
   CHECK(javaLangObject != nullptr);
 
   jclass javaLangClass = soa.AddLocalReference<jclass>(mirror::Class::GetJavaLangClass());
@@ -67,7 +69,7 @@
       "equals", "(Ljava/lang/Object;)Z", kRuntimePointerSize);
   CHECK(method != nullptr);
   CHECK(!method->IsDirect());
-  CHECK(method->GetDeclaringClass() == javaLangObject);
+  CHECK(method->GetDeclaringClass() == javaLangObject.Get());
   DCHECK(!Runtime::Current()->IsActiveTransaction());
   soa.Env()->SetObjectArrayElement(
       proxyClassMethods, array_index++, soa.AddLocalReference<jobject>(
@@ -75,7 +77,7 @@
   method = javaLangObject->FindClassMethod("hashCode", "()I", kRuntimePointerSize);
   CHECK(method != nullptr);
   CHECK(!method->IsDirect());
-  CHECK(method->GetDeclaringClass() == javaLangObject);
+  CHECK(method->GetDeclaringClass() == javaLangObject.Get());
   soa.Env()->SetObjectArrayElement(
       proxyClassMethods, array_index++, soa.AddLocalReference<jobject>(
           mirror::Method::CreateFromArtMethod<kRuntimePointerSize, false>(soa.Self(), method)));
@@ -83,7 +85,7 @@
       "toString", "()Ljava/lang/String;", kRuntimePointerSize);
   CHECK(method != nullptr);
   CHECK(!method->IsDirect());
-  CHECK(method->GetDeclaringClass() == javaLangObject);
+  CHECK(method->GetDeclaringClass() == javaLangObject.Get());
   soa.Env()->SetObjectArrayElement(
       proxyClassMethods, array_index++, soa.AddLocalReference<jobject>(
           mirror::Method::CreateFromArtMethod<kRuntimePointerSize, false>(soa.Self(), method)));