diff options
author | 2016-10-17 15:46:31 -0700 | |
---|---|---|
committer | 2016-10-17 16:16:50 -0700 | |
commit | bc5a795c0d486c84913d987cad5846ded840cea6 (patch) | |
tree | 90db29a97a21fa15f4cbc5ffbc1f6dd191add49c /runtime/native/java_lang_VMClassLoader.cc | |
parent | 38a4223fcc0493553d9ad324a1dc145869eb663a (diff) |
Move art/native to ObjPtr
Bug: 31113334
Test: test-art-host
Change-Id: I67eb89cf042c762c6dcd5eb8b008b9a28e9b3319
Diffstat (limited to 'runtime/native/java_lang_VMClassLoader.cc')
-rw-r--r-- | runtime/native/java_lang_VMClassLoader.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc index 73d12f1a59..1fe89bf2f8 100644 --- a/runtime/native/java_lang_VMClassLoader.cc +++ b/runtime/native/java_lang_VMClassLoader.cc @@ -37,24 +37,24 @@ static jclass VMClassLoader_findLoadedClass(JNIEnv* env, jclass, jobject javaLoa ClassLinker* cl = Runtime::Current()->GetClassLinker(); std::string descriptor(DotToDescriptor(name.c_str())); const size_t descriptor_hash = ComputeModifiedUtf8Hash(descriptor.c_str()); - mirror::Class* c = cl->LookupClass(soa.Self(), - descriptor.c_str(), - descriptor_hash, - loader.Ptr()); + ObjPtr<mirror::Class> c = cl->LookupClass(soa.Self(), + descriptor.c_str(), + descriptor_hash, + loader.Ptr()); if (c != nullptr && c->IsResolved()) { return soa.AddLocalReference<jclass>(c); } // If class is erroneous, throw the earlier failure, wrapped in certain cases. See b/28787733. if (c != nullptr && c->IsErroneous()) { - cl->ThrowEarlierClassFailure(c); + cl->ThrowEarlierClassFailure(c.Ptr()); Thread* self = soa.Self(); - mirror::Class* eiie_class = + ObjPtr<mirror::Class> eiie_class = self->DecodeJObject(WellKnownClasses::java_lang_ExceptionInInitializerError)->AsClass(); - mirror::Class* iae_class = + ObjPtr<mirror::Class> iae_class = self->DecodeJObject(WellKnownClasses::java_lang_IllegalAccessError)->AsClass(); - mirror::Class* ncdfe_class = + ObjPtr<mirror::Class> ncdfe_class = self->DecodeJObject(WellKnownClasses::java_lang_NoClassDefFoundError)->AsClass(); - mirror::Class* exception = self->GetException()->GetClass(); + ObjPtr<mirror::Class> exception = self->GetException()->GetClass(); if (exception == eiie_class || exception == iae_class || exception == ncdfe_class) { self->ThrowNewWrappedException("Ljava/lang/ClassNotFoundException;", PrettyDescriptor(c).c_str()); |