diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-11-25 11:20:28 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-11-25 14:40:18 -0800 |
| commit | 3115877616e44b245ecf2c5466d52c749086d3b0 (patch) | |
| tree | 720c9ed875e40e527a9e244fe8ef0cf19a494ebe /compiler/oat_writer.h | |
| parent | dc00c73d24a46c8522176fbc539f3e39710807c2 (diff) | |
| download | android_art-3115877616e44b245ecf2c5466d52c749086d3b0.tar.gz android_art-3115877616e44b245ecf2c5466d52c749086d3b0.tar.bz2 android_art-3115877616e44b245ecf2c5466d52c749086d3b0.zip | |
Fix oatwriter code deduping
Now that the GC maps are part of the oat method header they need
to be checked in CodeOffsetsKeyComparator.
Bug: 18523556
Change-Id: I539a6e7216166342b22515c1e2cf831dad32e41e
(cherry picked from commit 4cdf4508903d13fd0f9fba5690aeac1b368db81b)
Diffstat (limited to 'compiler/oat_writer.h')
| -rw-r--r-- | compiler/oat_writer.h | 3 |
1 files changed, 3 insertions, 0 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())) { |