commit a7c04c4fe6623985ba2d0cca942d5e1e584f4358
author Nicolas Geoffray <ngeoffray@google.com> Fri Mar 24 08:55:08 2017 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Mar 24 08:55:08 2017 +0000
tree ede1a98db77cfb0a05e3d445b7e1f7aed3d242d3
parent 9556cb2bfc6788656d53a9ddb2159ca2040f6e38

Revert "Make original dex file be more deduplicated"

Bug: 31455788

This reverts commit 9556cb2bfc6788656d53a9ddb2159ca2040f6e38.

Change-Id: If22f2bd9d1b788c2a784dbe0e7f0c2304d8e4a59

runtime/mirror/class_ext.h

diff --git a/runtime/mirror/class_ext.h b/runtime/mirror/class_ext.h
index 708665d..fac955a 100644
--- a/runtime/mirror/class_ext.h
+++ b/runtime/mirror/class_ext.h
@@ -60,11 +60,11 @@
         OFFSET_OF_OBJECT_MEMBER(ClassExt, obsolete_methods_));
   }
 
-  Object* GetOriginalDexFile() REQUIRES_SHARED(Locks::mutator_lock_) {
-    return GetFieldObject<Object>(OFFSET_OF_OBJECT_MEMBER(ClassExt, original_dex_file_));
+  ByteArray* GetOriginalDexFileBytes() REQUIRES_SHARED(Locks::mutator_lock_) {
+    return GetFieldObject<ByteArray>(OFFSET_OF_OBJECT_MEMBER(ClassExt, original_dex_file_bytes_));
   }
 
-  void SetOriginalDexFile(ObjPtr<Object> bytes) REQUIRES_SHARED(Locks::mutator_lock_);
+  void SetOriginalDexFileBytes(ObjPtr<ByteArray> bytes) REQUIRES_SHARED(Locks::mutator_lock_);
 
   void SetObsoleteArrays(ObjPtr<PointerArray> methods, ObjPtr<ObjectArray<DexCache>> dex_caches)
       REQUIRES_SHARED(Locks::mutator_lock_);
@@ -89,7 +89,7 @@
 
   HeapReference<PointerArray> obsolete_methods_;
 
-  HeapReference<Object> original_dex_file_;
+  HeapReference<ByteArray> original_dex_file_bytes_;
 
   // The saved verification error of this class.
   HeapReference<Object> verify_error_;