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.cc | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'runtime/class_table.cc') diff --git a/runtime/class_table.cc b/runtime/class_table.cc index 2a4f0e01af..df2dbf416c 100644 --- a/runtime/class_table.cc +++ b/runtime/class_table.cc @@ -40,16 +40,6 @@ bool ClassTable::Contains(mirror::Class* klass) { return false; } -mirror::Class* ClassTable::LookupByDescriptor(mirror::Class* klass) { - for (ClassSet& class_set : classes_) { - auto it = class_set.Find(GcRoot(klass)); - if (it != class_set.end()) { - return it->Read(); - } - } - return nullptr; -} - mirror::Class* ClassTable::UpdateClass(const char* descriptor, mirror::Class* klass, size_t hash) { // Should only be updating latest table. auto existing_it = classes_.back().FindWithHash(descriptor, hash); @@ -183,12 +173,4 @@ size_t ClassTable::ReadFromMemory(uint8_t* ptr) { return read_count; } -void ClassTable::SetClassLoader(mirror::ClassLoader* class_loader) { - for (const ClassSet& class_set : classes_) { - for (const GcRoot& root : class_set) { - root.Read()->SetClassLoader(class_loader); - } - } -} - } // namespace art -- cgit v1.2.3-59-g8ed1b