From: Calin Juravle <calin@google.com>
Date: Fri, 5 Sep 2014 15:14:19 +0000 (+0100)
Subject: Remove unreachable code from class_linker.cc
X-Git-Tag: android-x86-7.1-r1~889^2~3162^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a8c55ae449ad423087f232b2fec1064062755970;p=android-x86%2Fart.git

Remove unreachable code from class_linker.cc

If the checksum doesn't match the oat_dex_file will be NULL, a case
which is handled in the first if.

Bug: 17402267

Change-Id: If8547ddc8fd7eff59a3b7dd36c07ac4ceb351361
---

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index ad436d0d9..ca97b08e1 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1189,13 +1189,7 @@ bool ClassLinker::VerifyOatAndDexFileChecksums(const OatFile* oat_file,
     return false;
   }
 
-  if (dex_location_checksum != oat_dex_file->GetDexFileLocationChecksum()) {
-    *error_msg = StringPrintf("oat file '%s' mismatch (0x%x) with '%s' (0x%x)",
-                              oat_file->GetLocation().c_str(),
-                              oat_dex_file->GetDexFileLocationChecksum(),
-                              dex_location, dex_location_checksum);
-    return false;
-  }
+  DCHECK_EQ(dex_location_checksum, oat_dex_file->GetDexFileLocationChecksum());
   return true;
 }