diff options
Diffstat (limited to 'runtime/class_linker.h')
-rw-r--r-- | runtime/class_linker.h | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index a26e63b49e..1c280a4662 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -185,7 +185,9 @@ class ClassLinker { // boot_class_path_. mirror::Class* FindSystemClass(Thread* self, const char* descriptor) REQUIRES_SHARED(Locks::mutator_lock_) - REQUIRES(!Locks::dex_lock_); + REQUIRES(!Locks::dex_lock_) { + return FindClass(self, descriptor, ScopedNullHandle<mirror::ClassLoader>()); + } // Finds the array class given for the element class. mirror::Class* FindArrayClass(Thread* self, ObjPtr<mirror::Class>* element_class) @@ -231,12 +233,6 @@ class ClassLinker { REQUIRES_SHARED(Locks::mutator_lock_); // Resolve a String with the given index from the DexFile, storing the - // result in the DexCache. The referrer is used to identify the - // target DexCache and ClassLoader to use for resolution. - mirror::String* ResolveString(dex::StringIndex string_idx, ArtMethod* referrer) - REQUIRES_SHARED(Locks::mutator_lock_); - - // Resolve a String with the given index from the DexFile, storing the // result in the DexCache. mirror::String* ResolveString(const DexFile& dex_file, dex::StringIndex string_idx, @@ -436,25 +432,6 @@ class ClassLinker { REQUIRES(!Locks::dex_lock_) REQUIRES_SHARED(Locks::mutator_lock_); - // Allocate an instance of a java.lang.Object. - mirror::Object* AllocObject(Thread* self) - REQUIRES_SHARED(Locks::mutator_lock_) - REQUIRES(!Roles::uninterruptible_); - - // TODO: replace this with multiple methods that allocate the correct managed type. - template <class T> - mirror::ObjectArray<T>* AllocObjectArray(Thread* self, size_t length) - REQUIRES_SHARED(Locks::mutator_lock_) - REQUIRES(!Roles::uninterruptible_); - - mirror::ObjectArray<mirror::Class>* AllocClassArray(Thread* self, size_t length) - REQUIRES_SHARED(Locks::mutator_lock_) - REQUIRES(!Roles::uninterruptible_); - - mirror::ObjectArray<mirror::String>* AllocStringArray(Thread* self, size_t length) - REQUIRES_SHARED(Locks::mutator_lock_) - REQUIRES(!Roles::uninterruptible_); - LengthPrefixedArray<ArtField>* AllocArtFieldArray(Thread* self, LinearAlloc* allocator, size_t length); |