From b9b7d91f5ceb0b738e1774992fd6fe205c6091e9 Mon Sep 17 00:00:00 2001
From: Orion Hodson <oth@google.com>
Date: Wed, 24 Feb 2021 09:24:47 +0000
Subject: Revert "Lazily allocate DexCache arrays."

This reverts commit 1214319d27e7fb4c4ff00b39799df6f15288098a.

Reason for revert: Post-submit fails
Bug: b/181097963
Test: TH

Change-Id: I9fd21140f1703d0020458b786f48bd39889a9948
---
 runtime/class_linker.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'runtime/class_linker.h')

diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index d1212a3e77..95dc6cfaff 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -93,6 +93,9 @@ class MethodHandlesLookup;
 class MethodType;
 template<class T> class ObjectArray;
 class StackTraceElement;
+template <typename T> struct NativeDexCachePair;
+using MethodDexCachePair = NativeDexCachePair<ArtMethod>;
+using MethodDexCacheType = std::atomic<MethodDexCachePair>;
 }  // namespace mirror
 
 class ClassVisitor {
@@ -949,7 +952,7 @@ class ClassLinker {
   // Used for tests and AppendToBootClassPath.
   ObjPtr<mirror::DexCache> AllocAndInitializeDexCache(Thread* self,
                                                       const DexFile& dex_file,
-                                                      ObjPtr<mirror::ClassLoader> class_loader)
+                                                      LinearAlloc* linear_alloc)
       REQUIRES_SHARED(Locks::mutator_lock_)
       REQUIRES(!Locks::dex_lock_)
       REQUIRES(!Roles::uninterruptible_);
-- 
cgit v1.2.3-59-g8ed1b