Change ClassLinker::dex_caches_ from list to unordered_map.

Move the DexFile* pointer from struct field out to map key.
This makes it easy and fast to find DexCache from DexFile.

Add check that given DexFile* is registered only once.

Test: test.py -b -r --host --64
Test: generated images are identical as before
Change-Id: I84a6d6cbf963af2408abe5bb5e4c99d0ca11df78

1 files changed, 2 insertions, 4 deletions

diff --git a/runtime/class_linker-inl.h b/runtime/class_linker-inl.h
index da066d1180..4e8f8edf64 100644
--- a/runtime/class_linker-inl.h
+++ b/runtime/class_linker-inl.h
@@ -455,10 +455,8 @@ void ClassLinker::VisitKnownDexFiles(Thread* self, Visitor visitor) {
   ReaderMutexLock rmu(self, *Locks::dex_lock_);
   std::for_each(dex_caches_.begin(),
                 dex_caches_.end(),
-                [&](DexCacheData& dcd) REQUIRES(Locks::mutator_lock_) {
-                  if (dcd.IsValid()) {
-                    visitor(dcd.dex_file);
-                  }
+                [&](const auto& entry) REQUIRES(Locks::mutator_lock_) {
+                  visitor(/*dex_file=*/entry.first);
                 });
 }