Revert "Disable DCHECK's that break cdex-redefine-stress tests."
This reverts commit 9e75de89a033b729d3130bdd037c14a4dd60902e.
Reason for revert: Fix available.
Bug: 243128839
Test: art/test.py -b -r --host --debug --cdex-fast --optimizing \
--redefine-stress --debuggable
Change-Id: Iee4fad1fe686513dd282c8a5676ab6fc364b68e2
diff --git a/runtime/oat_file_assistant_context.cc b/runtime/oat_file_assistant_context.cc
index 2debce1..d282d03 100644
--- a/runtime/oat_file_assistant_context.cc
+++ b/runtime/oat_file_assistant_context.cc
@@ -74,17 +74,13 @@
std::vector<std::string>* current_bcp_checksums = nullptr;
for (const DexFile* dex_file : runtime->GetClassLinker()->GetBootClassPath()) {
if (!DexFileLoader::IsMultiDexLocation(dex_file->GetLocation().c_str())) {
- // TODO(b/243128839): Investigate why this doesn't hold for
- // cdex-redefine-stress tests.
- // DCHECK_LT(bcp_index, runtime_options_->boot_class_path.size());
+ DCHECK_LT(bcp_index, runtime_options_->boot_class_path.size());
current_bcp_checksums = &bcp_checksums_by_index_[bcp_index++];
}
DCHECK_NE(current_bcp_checksums, nullptr);
current_bcp_checksums->push_back(StringPrintf("/%08x", dex_file->GetLocationChecksum()));
}
- // TODO(b/243128839): Investigate why this doesn't hold for
- // cdex-redefine-stress tests.
- // DCHECK_EQ(bcp_index, runtime_options_->boot_class_path.size());
+ DCHECK_EQ(bcp_index, runtime_options_->boot_class_path.size());
// Fetch APEX versions from the runtime.
apex_versions_ = runtime->GetApexVersions();