commit 0b8cdfaef922cac9da13e6a8ac4e428031c02b50
author Vladimir Marko <vmarko@google.com> Thu Jan 14 22:06:23 2016 +0000
committer Vladimir Marko <vmarko@google.com> Fri Jan 15 11:27:22 2016 +0000
tree 8e8b9c330ae9c886611c6e5ae598e21d9b3ea17a
parent 28943466954ca5d6f586bb5496f7f3f0f85fe87a

ART: Fix CompilerDriver::AreInSameOatFile().

Bug: 26317072
Change-Id: I4279ef6559a43b5d59188616712a867f864b5d79

compiler/driver/compiler_driver.h

diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h
index 3847c81..17b2f5e 100644
--- a/compiler/driver/compiler_driver.h
+++ b/compiler/driver/compiler_driver.h
@@ -122,8 +122,10 @@
       return true;
     }
     auto it1 = dex_file_oat_filename_map_->find(d1);
+    DCHECK(it1 != dex_file_oat_filename_map_->end());
     auto it2 = dex_file_oat_filename_map_->find(d2);
-    return it1 == it2;
+    DCHECK(it2 != dex_file_oat_filename_map_->end());
+    return it1->second == it2->second;
   }
 
   void CompileAll(jobject class_loader,