From: Vladimir Marko <vmarko@google.com>
Date: Thu, 14 Jan 2016 22:06:23 +0000 (+0000)
Subject: ART: Fix CompilerDriver::AreInSameOatFile().
X-Git-Tag: android-x86-7.1-r1~424^2~253^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0b8cdfaef922cac9da13e6a8ac4e428031c02b50;p=android-x86%2Fart.git

ART: Fix CompilerDriver::AreInSameOatFile().

Bug: 26317072
Change-Id: I4279ef6559a43b5d59188616712a867f864b5d79
---

diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h
index 3847c8183..17b2f5e98 100644
--- a/compiler/driver/compiler_driver.h
+++ b/compiler/driver/compiler_driver.h
@@ -122,8 +122,10 @@ class CompilerDriver {
       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,