Change safecast data from set to an ordered vector.
This saves memory and improves performance.
Bug: 12167380
Change-Id: Ica8d9291cdd515e8eab03814fb75a85d424eb629
diff --git a/compiler/dex/verified_methods_data.cc b/compiler/dex/verified_methods_data.cc
index 454b92c..b3ceefc 100644
--- a/compiler/dex/verified_methods_data.cc
+++ b/compiler/dex/verified_methods_data.cc
@@ -130,8 +130,8 @@
}
// Look up the cast address in the set of safe casts
- MethodSafeCastSet::const_iterator cast_it = it->second->find(pc);
- return cast_it != it->second->end();
+ // Use binary_search for lookup in the sorted vector.
+ return std::binary_search(it->second->begin(), it->second->end(), pc);
}
void VerifiedMethodsData::AddRejectedClass(ClassReference ref) {
@@ -337,8 +337,10 @@
if (is_safe_cast) {
if (mscs.get() == nullptr) {
mscs.reset(new MethodSafeCastSet());
+ } else {
+ DCHECK_LT(mscs->back(), dex_pc); // Verify ordering for push_back() to the sorted vector.
}
- mscs->insert(dex_pc);
+ mscs->push_back(dex_pc);
}
}
}