Merge "Fix dex cache resolved types and class table mismatch."

1 files changed, 13 insertions, 0 deletions

diff --git a/runtime/class_table.cc b/runtime/class_table.cc
index f1458b42ab..af4f998fdf 100644
--- a/runtime/class_table.cc
+++ b/runtime/class_table.cc
@@ -117,6 +117,19 @@ mirror::Class* ClassTable::Lookup(const char* descriptor, size_t hash) {
   return nullptr;
 }
 
+ObjPtr<mirror::Class> ClassTable::TryInsert(ObjPtr<mirror::Class> klass) {
+  TableSlot slot(klass);
+  WriterMutexLock mu(Thread::Current(), lock_);
+  for (ClassSet& class_set : classes_) {
+    auto it = class_set.Find(slot);
+    if (it != class_set.end()) {
+      return it->Read();
+    }
+  }
+  classes_.back().Insert(slot);
+  return klass;
+}
+
 void ClassTable::Insert(ObjPtr<mirror::Class> klass) {
   const uint32_t hash = TableSlot::HashDescriptor(klass);
   WriterMutexLock mu(Thread::Current(), lock_);