commit dfb5f9ceb277f30ee961b27e72d968e0695611a6
author Mathieu Chartier <mathieuc@google.com> Thu Aug 27 17:32:26 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 27 17:32:26 2015 +0000
tree b3ac26646076705856e3fb4470503c63c85730f8
parent 75d4e58decf3f0be8814039df57456368e4d5475
parent 5af910615a4b99eb7f493465bf3d42558c596237

Merge "Re-add location check for FindDexCache"

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 3b505e6..a722fa8 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2540,10 +2540,17 @@
       return dex_cache;
     }
   }
+  // Check dex file by location, this is used for oatdump.
+  std::string location(dex_file.GetLocation());
+  for (jobject weak_root : dex_caches_) {
+    mirror::DexCache* dex_cache = down_cast<mirror::DexCache*>(self->DecodeJObject(weak_root));
+    if (dex_cache != nullptr && dex_cache->GetDexFile()->GetLocation() == location) {
+      return dex_cache;
+    }
+  }
   if (allow_failure) {
     return nullptr;
   }
-  std::string location(dex_file.GetLocation());
   // Failure, dump diagnostic and abort.
   for (jobject weak_root : dex_caches_) {
     mirror::DexCache* dex_cache = down_cast<mirror::DexCache*>(self->DecodeJObject(weak_root));