Tolerate GC map being added twice, if it has the same contents

Change-Id: I3b973c06aa5b170e0b8fb7e28136b65fc8855880

1 files changed, 5 insertions, 1 deletions

diff --git a/src/dex_verifier.cc b/src/dex_verifier.cc
index 1b4a26207d..c2190426b0 100644
--- a/src/dex_verifier.cc
+++ b/src/dex_verifier.cc
@@ -3840,7 +3840,11 @@ const uint8_t* PcToReferenceMap::FindBitMap(uint16_t dex_pc, bool error_if_not_p
 DexVerifier::GcMapTable DexVerifier::gc_maps_;
 
 void DexVerifier::SetGcMap(Compiler::MethodReference ref, const std::vector<uint8_t>& gc_map) {
-  CHECK(GetGcMap(ref) == NULL);
+  const std::vector<uint8_t>* existing_gc_map = GetGcMap(ref);
+  if (existing_gc_map != NULL) {
+    CHECK(*existing_gc_map == gc_map);
+    delete existing_gc_map;
+  }
   gc_maps_[ref] = &gc_map;
   CHECK(GetGcMap(ref) != NULL);
 }