diff options
| -rw-r--r-- | compiler/oat_writer.h | 3 | ||||
| -rw-r--r-- | runtime/oat.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/compiler/oat_writer.h b/compiler/oat_writer.h index 5b61f2113d..b3ac7ff895 100644 --- a/compiler/oat_writer.h +++ b/compiler/oat_writer.h @@ -353,6 +353,9 @@ class OatWriter { if (UNLIKELY(&lhs->GetVmapTable() != &rhs->GetVmapTable())) { return &lhs->GetVmapTable() < &rhs->GetVmapTable(); } + if (UNLIKELY(lhs->GetGcMap() != rhs->GetGcMap())) { + return lhs->GetGcMap() < rhs->GetGcMap(); + } const auto& lhs_patches = lhs->GetPatches(); const auto& rhs_patches = rhs->GetPatches(); if (UNLIKELY(lhs_patches.size() != rhs_patches.size())) { diff --git a/runtime/oat.cc b/runtime/oat.cc index 64557839d7..8a595ac296 100644 --- a/runtime/oat.cc +++ b/runtime/oat.cc @@ -25,7 +25,7 @@ namespace art { const uint8_t OatHeader::kOatMagic[] = { 'o', 'a', 't', '\n' }; -const uint8_t OatHeader::kOatVersion[] = { '0', '4', '9', '\0' }; +const uint8_t OatHeader::kOatVersion[] = { '0', '5', '0', '\0' }; static size_t ComputeOatHeaderSize(const SafeMap<std::string, std::string>* variable_data) { size_t estimate = 0U; |