From ef0b9c465a24f1ff1c3442c9ae45ae0e0456e09e Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Mon, 4 Jul 2022 16:24:06 +0000
Subject: Reland "Adjust how we assign vtable indexes during class loading."

This reverts commit 07c2fec6b025d5cc104ab4f210c3941528f56fd6.

Bug: 211854716
Bug: 233545487
Bug: 181943478

Reason for revert: addressed comments

Change-Id: Id45c8e826b81f00190920a2b3270937614700f5f
---
 runtime/mirror/array-inl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/mirror/array-inl.h')

diff --git a/runtime/mirror/array-inl.h b/runtime/mirror/array-inl.h
index b0e77b45a6..b7a8a8ce49 100644
--- a/runtime/mirror/array-inl.h
+++ b/runtime/mirror/array-inl.h
@@ -98,7 +98,7 @@ inline void PrimitiveArray<T>::SetWithoutChecks(int32_t i, T value) {
   if (kTransactionActive) {
     Runtime::Current()->RecordWriteArray(this, i, GetWithoutChecks(i));
   }
-  DCHECK(CheckIsValidIndex<kVerifyFlags>(i));
+  DCHECK(CheckIsValidIndex<kVerifyFlags>(i)) << i << " " << GetLength<kVerifyFlags>();
   GetData()[i] = value;
 }
 // Backward copy where elements are of aligned appropriately for T. Count is in T sized units.
-- 
cgit v1.2.3-59-g8ed1b