commit 2237607aca5e75d0b608500f8d140a0ed6c7a698
author Lokesh Gidra <lokeshgidra@google.com> Fri Sep 08 22:06:07 2023 +0000
committer Lokesh Gidra <lokeshgidra@google.com> Sat Sep 09 00:14:35 2023 +0000
tree 9ffb0fce0deed66670477257567bd9a617449105
parent 0b58115f797b2fcb533615063fe12a5dd2fe2271

Revert "Add logging when art-method is found to be null during class-unloading"

This reverts commit cc71b0afb121d2258094e3dc909e8dd6b3eb7a52.

Reason for revert: Logging is no longer required.
Bug: 298575095

Change-Id: Ib78adce5533ed0d86b76f122acb6a6ce28d9b534

runtime/cha.cc

diff --git a/runtime/cha.cc b/runtime/cha.cc
index 7d2fa2b..8b77f76 100644
--- a/runtime/cha.cc
+++ b/runtime/cha.cc
@@ -168,13 +168,6 @@
          j < count;
          ++j) {
       ArtMethod* method = interface->GetVirtualMethod(j, pointer_size);
-      CHECK(method != nullptr) << "interface:" << interface << " iftable:" << iftable << " i:" << i
-                               << " ifcout:" << ifcount << " j:" << j
-                               << " iftable-method-array-count:" << count
-                               << " method-array:" << interface->GetMethodsPtr()
-                               << " method-array-size:" << interface->NumMethods()
-                               << " virtual-method-count:"
-                               << interface->GetVirtualMethodsStartOffset();
       if (method->HasSingleImplementation() &&
           alloc->ContainsUnsafe(method->GetSingleImplementation(pointer_size)) &&
           !method->IsDefault()) {

runtime/mirror/class.h

diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index ceb322a..9f74066 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -1380,9 +1380,6 @@
   // See b/259501764.
   bool CheckIsVisibleWithTargetSdk(Thread* self) REQUIRES_SHARED(Locks::mutator_lock_);
 
-  // The index in the methods_ array where the first declared virtual method is.
-  ALWAYS_INLINE uint32_t GetVirtualMethodsStartOffset() REQUIRES_SHARED(Locks::mutator_lock_);
-
  private:
   template <typename T, VerifyObjectFlags kVerifyFlags, typename Visitor>
   void FixupNativePointer(
@@ -1416,6 +1413,9 @@
   IterationRange<StrideIterator<ArtField>> GetIFieldsUnchecked()
       REQUIRES_SHARED(Locks::mutator_lock_);
 
+  // The index in the methods_ array where the first declared virtual method is.
+  ALWAYS_INLINE uint32_t GetVirtualMethodsStartOffset() REQUIRES_SHARED(Locks::mutator_lock_);
+
   // The index in the methods_ array where the first direct method is.
   ALWAYS_INLINE uint32_t GetDirectMethodsStartOffset() REQUIRES_SHARED(Locks::mutator_lock_);