From e9987b0831403858d95bdd7a5ef9e56665a9702d Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 22 May 2018 16:26:43 +0100 Subject: 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'runtime/proxy_test.h') diff --git a/runtime/proxy_test.h b/runtime/proxy_test.h index b559823257..98362649f5 100644 --- a/runtime/proxy_test.h +++ b/runtime/proxy_test.h @@ -37,7 +37,9 @@ mirror::Class* GenerateProxyClass(ScopedObjectAccess& soa, const char* className, const std::vector& interfaces) REQUIRES_SHARED(Locks::mutator_lock_) { - mirror::Class* javaLangObject = class_linker->FindSystemClass(soa.Self(), "Ljava/lang/Object;"); + StackHandleScope<1> hs(soa.Self()); + Handle javaLangObject = hs.NewHandle( + class_linker->FindSystemClass(soa.Self(), "Ljava/lang/Object;")); CHECK(javaLangObject != nullptr); jclass javaLangClass = soa.AddLocalReference(mirror::Class::GetJavaLangClass()); @@ -67,7 +69,7 @@ mirror::Class* GenerateProxyClass(ScopedObjectAccess& soa, "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( @@ -75,7 +77,7 @@ mirror::Class* GenerateProxyClass(ScopedObjectAccess& soa, 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( mirror::Method::CreateFromArtMethod(soa.Self(), method))); @@ -83,7 +85,7 @@ mirror::Class* GenerateProxyClass(ScopedObjectAccess& soa, "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( mirror::Method::CreateFromArtMethod(soa.Self(), method))); -- cgit v1.2.3-59-g8ed1b