commit 2c1a89d55d181f39c0a8f0872610543c54e66d7f
author Nicolas Geoffray <ngeoffray@google.com> Tue Jun 13 17:21:17 2023 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jun 14 08:35:56 2023 +0000
tree 17472a834896ad5c923d4730385dd7251de86637
parent 98f287b62ba948678ed98b74363ea4eb8717b3d8

Revert "Add some debugging output for b/261719949."

This reverts commit e9506c96ece6740471cb4576b130628424a042ef.

Bug: 261719949
Bug: 286348973

Reason for revert: Remove debugging code.

Change-Id: If037193aed909263f04a70da33db31e14fd228b2

runtime/interpreter/mterp/nterp.cc

diff --git a/runtime/interpreter/mterp/nterp.cc b/runtime/interpreter/mterp/nterp.cc
index 4439451..66e9192 100644
--- a/runtime/interpreter/mterp/nterp.cc
+++ b/runtime/interpreter/mterp/nterp.cc
@@ -30,7 +30,6 @@
 #include "interpreter/shadow_frame-inl.h"
 #include "mirror/string-alloc-inl.h"
 #include "nterp_helpers.h"
-#include "verify_object-inl.h"
 
 namespace art {
 namespace interpreter {
@@ -299,39 +298,9 @@
 
 static constexpr std::array<uint8_t, 256u> kOpcodeInvokeTypes = GenerateOpcodeInvokeTypes();
 
-// Temporary dumping output for helping diagnose b/261719949.
-static std::string DumpInformation(
-    Thread* self, ArtMethod* caller, const uint16_t* dex_pc_ptr) {
-  return android::base::StringPrintf(
-      "b/261719949: self=%p, caller=%p, dex_pc_ptr=%p", self, caller, dex_pc_ptr);
-}
-
-NO_INLINE static void CheckParameters(Thread* self, ArtMethod* caller, const uint16_t* dex_pc_ptr)
-    REQUIRES_SHARED(Locks::mutator_lock_) {
-  CHECK_EQ(self, Thread::Current()) << DumpInformation(self, caller, dex_pc_ptr);
-  // AOT compiler cross-compiles 64bits to 32bits, so for simplicity, don't
-  // check.
-  if (!Runtime::Current()->IsAotCompiler()) {
-    CHECK(IsAligned<sizeof(void*)>(caller)) << DumpInformation(self, caller, dex_pc_ptr);
-  }
-  ObjPtr<mirror::Class> cls = caller->GetDeclaringClass();
-  CHECK(IsAligned<kObjectAlignment>(cls.Ptr())) << DumpInformation(self, caller, dex_pc_ptr);
-  CHECK(VerifyClassClass(cls)) << DumpInformation(self, caller, dex_pc_ptr);
-  const DexFile& dex_file = cls->GetDexFile();
-  if (!caller->IsObsolete()) {
-    CHECK_LT(reinterpret_cast<uintptr_t>(dex_pc_ptr),
-             reinterpret_cast<uintptr_t>(dex_file.DataBegin() + dex_file.DataSize()))
-        << DumpInformation(self, caller, dex_pc_ptr);
-    CHECK_GT(reinterpret_cast<uintptr_t>(dex_pc_ptr),
-             reinterpret_cast<uintptr_t>(dex_file.DataBegin()))
-        << DumpInformation(self, caller, dex_pc_ptr);
-  }
-}
-
 FLATTEN
 extern "C" size_t NterpGetMethod(Thread* self, ArtMethod* caller, const uint16_t* dex_pc_ptr)
     REQUIRES_SHARED(Locks::mutator_lock_) {
-  CheckParameters(self, caller, dex_pc_ptr);
   UpdateHotness(caller);
   const Instruction* inst = Instruction::At(dex_pc_ptr);
   Instruction::Code opcode = inst->Opcode();
@@ -407,7 +376,6 @@
                                       const uint16_t* dex_pc_ptr,
                                       size_t resolve_field_type)  // Resolve if not zero
     REQUIRES_SHARED(Locks::mutator_lock_) {
-  CheckParameters(self, caller, dex_pc_ptr);
   UpdateHotness(caller);
   const Instruction* inst = Instruction::At(dex_pc_ptr);
   uint16_t field_index = inst->VRegB_21c();
@@ -463,7 +431,6 @@
                                                 const uint16_t* dex_pc_ptr,
                                                 size_t resolve_field_type)  // Resolve if not zero
     REQUIRES_SHARED(Locks::mutator_lock_) {
-  CheckParameters(self, caller, dex_pc_ptr);
   UpdateHotness(caller);
   const Instruction* inst = Instruction::At(dex_pc_ptr);
   uint16_t field_index = inst->VRegC_22c();
@@ -568,7 +535,6 @@
 
 extern "C" mirror::Object* NterpLoadObject(Thread* self, ArtMethod* caller, uint16_t* dex_pc_ptr)
     REQUIRES_SHARED(Locks::mutator_lock_) {
-  CheckParameters(self, caller, dex_pc_ptr);
   const Instruction* inst = Instruction::At(dex_pc_ptr);
   ClassLinker* const class_linker = Runtime::Current()->GetClassLinker();
   switch (inst->Opcode()) {