Revert "Revert "Revert "Add consistency CHECKs around ArtMethod fields."""
This reverts commit f994025d8ebc8ef63d2083436daffc7f94363c80.
Reason for revert: Still hitting the failure.
Bug: 146765723
Change-Id: Ie07300e9d2e605cd0281fb313d017680e77e8740
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index 93ccfc6..5356637 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -2493,10 +2493,6 @@
// We arrive here if we have found an implementation, and it is not in the ImtConflictTable.
// We create a new table with the new pair { interface_method, method }.
DCHECK(conflict_method->IsRuntimeMethod());
-
- // Classes in the boot image should never need to update conflict methods in
- // their IMT.
- CHECK(!Runtime::Current()->GetHeap()->ObjectIsInBootImageSpace(cls.Get()));
ArtMethod* new_conflict_method = Runtime::Current()->GetClassLinker()->AddMethodToConflictTable(
cls.Get(),
conflict_method,
diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index 8a27370..8ae57ff 100644
--- a/runtime/jit/jit.cc
+++ b/runtime/jit/jit.cc
@@ -1024,10 +1024,6 @@
// such methods, we need their entrypoints to be stubs that do the
// initialization check.
header.VisitPackedArtMethods([&](ArtMethod& method) NO_THREAD_SAFETY_ANALYSIS {
- // Methods in the boot image should never have their single
- // implementation flag set (and therefore never have a `data_` pointing
- // to an ArtMethod for single implementation).
- CHECK(method.IsIntrinsic() || !method.HasSingleImplementationFlag());
if (method.IsRuntimeMethod()) {
return;
}
