diff options
| author | 2018-05-23 16:06:04 +0000 | |
|---|---|---|
| committer | 2018-05-23 16:06:04 +0000 | |
| commit | ff7ff426e136aa8fd6e33d873f6259311982f6bb (patch) | |
| tree | ca937096fce3dcabf8890d80616ab5021d0b22b9 /runtime/proxy_test.h | |
| parent | aaebb1468cc95838aa58ed537d03de000c9cfe28 (diff) | |
| parent | e9987b0831403858d95bdd7a5ef9e56665a9702d (diff) | |
Merge "ObjPtr<>-ify tests using ClassLinker::FindClass()."
Diffstat (limited to 'runtime/proxy_test.h')
| -rw-r--r-- | runtime/proxy_test.h | 10 |
1 files changed, 6 insertions, 4 deletions
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<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 @@ 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<jobject>( @@ -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<jobject>( mirror::Method::CreateFromArtMethod<kRuntimePointerSize, false>(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<jobject>( mirror::Method::CreateFromArtMethod<kRuntimePointerSize, false>(soa.Self(), method))); |