From b476a29a2cda22b86fc1d96e4cc65ce36fb878af Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 27 Jun 2019 07:54:48 +0000
Subject: Revert "Support using opaque JNI ids"

This reverts commit 21d5994583c679cd5d8573b5d35dbd659bdca2c7.

Bug: 134162467

Reason for revert: Breaks debuggable

Change-Id: I9510a6ac208d392ff25ee196a1a519fecd151445
---
 runtime/mirror/class_ext.h | 46 +---------------------------------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

(limited to 'runtime/mirror/class_ext.h')

diff --git a/runtime/mirror/class_ext.h b/runtime/mirror/class_ext.h
index 6fb225fd69..70bea33c1f 100644
--- a/runtime/mirror/class_ext.h
+++ b/runtime/mirror/class_ext.h
@@ -46,33 +46,6 @@ class MANAGED ClassExt : public Object {
 
   ObjPtr<ObjectArray<DexCache>> GetObsoleteDexCaches() REQUIRES_SHARED(Locks::mutator_lock_);
 
-  template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags,
-           ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
-  ObjPtr<PointerArray> EnsureInstanceJFieldIDsArrayPresent(size_t count)
-      REQUIRES_SHARED(Locks::mutator_lock_);
-
-  template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags,
-           ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
-  ObjPtr<PointerArray> GetInstanceJFieldIDs() REQUIRES_SHARED(Locks::mutator_lock_);
-
-  template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags,
-           ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
-  ObjPtr<PointerArray> EnsureStaticJFieldIDsArrayPresent(size_t count)
-      REQUIRES_SHARED(Locks::mutator_lock_);
-
-  template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags,
-           ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
-  ObjPtr<PointerArray> GetStaticJFieldIDs() REQUIRES_SHARED(Locks::mutator_lock_);
-
-  template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags,
-           ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
-  ObjPtr<PointerArray> EnsureJMethodIDsArrayPresent(size_t count)
-      REQUIRES_SHARED(Locks::mutator_lock_);
-
-  template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags,
-           ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
-  ObjPtr<PointerArray> GetJMethodIDs() REQUIRES_SHARED(Locks::mutator_lock_);
-
   template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags,
            ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
   ObjPtr<PointerArray> GetObsoleteMethods() REQUIRES_SHARED(Locks::mutator_lock_);
@@ -109,36 +82,19 @@ class MANAGED ClassExt : public Object {
   static ObjPtr<ClassExt> Alloc(Thread* self) REQUIRES_SHARED(Locks::mutator_lock_);
 
  private:
-  template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags,
-           ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
-  ObjPtr<PointerArray> EnsureJniIdsArrayPresent(MemberOffset off, size_t count)
-      REQUIRES_SHARED(Locks::mutator_lock_);
-
   // Field order required by test "ValidateFieldOrderOfJavaCppUnionClasses".
-  // An array containing the jfieldIDs assigned to each field in the corresponding position in the
-  // classes ifields_ array or '0' if no id has been assigned to that field yet.
-  HeapReference<PointerArray> instance_jfield_ids_;
-
-  // An array containing the jmethodIDs assigned to each method in the corresponding position in
-  // the classes methods_ array or '0' if no id has been assigned to that method yet.
-  HeapReference<PointerArray> jmethod_ids_;
-
   HeapReference<ObjectArray<DexCache>> obsolete_dex_caches_;
 
   HeapReference<PointerArray> obsolete_methods_;
 
   HeapReference<Object> original_dex_file_;
 
-  // An array containing the jfieldIDs assigned to each field in the corresponding position in the
-  // classes sfields_ array or '0' if no id has been assigned to that field yet.
-  HeapReference<PointerArray> static_jfield_ids_;
-
   // The saved verification error of this class.
   HeapReference<Object> verify_error_;
 
   // Native pointer to DexFile and ClassDef index of this class before it was JVMTI-redefined.
-  int32_t pre_redefine_class_def_index_;
   int64_t pre_redefine_dex_file_ptr_;
+  int32_t pre_redefine_class_def_index_;
 
   friend struct art::ClassExtOffsets;  // for verifying offset information
   DISALLOW_IMPLICIT_CONSTRUCTORS(ClassExt);
-- 
cgit v1.2.3-59-g8ed1b