commit 83bef92043a5b9020e99eac076db5f327b36cb7e
author Dmitry Petrochenko <dmitry.petrochenko@intel.com> Mon Feb 03 12:34:59 2014 +0700
committer Dmitry Petrochenko <dmitry.petrochenko@intel.com> Tue Feb 11 09:47:49 2014 +0700
tree 6db772579979f0a7e8e646e4e30934093e33bc81
parent b1e61ad59958f70fe4db6e134b9c8dfc47733a30

art: dex offset fix in oat_file.cc for x86_64

Avoid wrong offset calculation when compiled for x86_64

Change-Id: Ic58335657e55b05372afcdce2f21102057d39303
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>

runtime/oat_file.cc

diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc
index 0f380ad..00a8506 100644
--- a/runtime/oat_file.cc
+++ b/runtime/oat_file.cc
@@ -226,7 +226,7 @@
   }
 
   for (size_t i = 0; i < GetOatHeader().GetDexFileCount(); i++) {
-    size_t dex_file_location_size = *reinterpret_cast<const uint32_t*>(oat);
+    uint32_t dex_file_location_size = *reinterpret_cast<const uint32_t*>(oat);
     if (UNLIKELY(dex_file_location_size == 0U)) {
       *error_msg = StringPrintf("In oat file '%s' found OatDexFile #%zd with empty location name",
                                 GetLocation().c_str(), i);