From 1bc977cf2f8199311a97f2ba9431a184540e3e9c Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Sat, 23 Jan 2016 14:15:49 +0000 Subject: Revert "Load app images" Fails when a method is duplicated (see test 097-duplicate-method) Bug: 22858531 This reverts commit f7fd970244f143b1abb956e29794c446e4d57f46. Change-Id: Ib30ae5be00cc568e799290be6b3c8f29cbbe4c20 --- runtime/class_table.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'runtime/class_table.h') diff --git a/runtime/class_table.h b/runtime/class_table.h index 0b420352c3..911f3c22db 100644 --- a/runtime/class_table.h +++ b/runtime/class_table.h @@ -84,14 +84,9 @@ class ClassTable { bool Visit(ClassVisitor* visitor) SHARED_REQUIRES(Locks::classlinker_classes_lock_, Locks::mutator_lock_); - // Return the first class that matches the descriptor. Returns null if there are none. mirror::Class* Lookup(const char* descriptor, size_t hash) SHARED_REQUIRES(Locks::classlinker_classes_lock_, Locks::mutator_lock_); - // Return the first class that matches the descriptor of klass. Returns null if there are none. - mirror::Class* LookupByDescriptor(mirror::Class* klass) - SHARED_REQUIRES(Locks::classlinker_classes_lock_, Locks::mutator_lock_); - void Insert(mirror::Class* klass) REQUIRES(Locks::classlinker_classes_lock_) SHARED_REQUIRES(Locks::mutator_lock_); @@ -112,17 +107,10 @@ class ClassTable { // Combines all of the tables into one class set. size_t WriteToMemory(uint8_t* ptr) const SHARED_REQUIRES(Locks::classlinker_classes_lock_, Locks::mutator_lock_); - - // Read a table from ptr and put it at the front of the class set. size_t ReadFromMemory(uint8_t* ptr) REQUIRES(Locks::classlinker_classes_lock_) SHARED_REQUIRES(Locks::mutator_lock_); - // Change the class loader of all the contained classes. - void SetClassLoader(mirror::ClassLoader* class_loader) - REQUIRES(Locks::classlinker_classes_lock_) - SHARED_REQUIRES(Locks::mutator_lock_); - private: class ClassDescriptorHashEquals { public: -- cgit v1.2.3-59-g8ed1b