diff options
author | 2021-02-24 09:24:47 +0000 | |
---|---|---|
committer | 2021-02-25 12:12:16 +0000 | |
commit | b9b7d91f5ceb0b738e1774992fd6fe205c6091e9 (patch) | |
tree | 06210044d3f66a0eb72e491ba9effc13bb827ced /runtime/class_linker.h | |
parent | 4c3ade67c470543562a0029e39b576954a807321 (diff) |
Revert "Lazily allocate DexCache arrays."
This reverts commit 1214319d27e7fb4c4ff00b39799df6f15288098a.
Reason for revert: Post-submit fails
Bug: b/181097963
Test: TH
Change-Id: I9fd21140f1703d0020458b786f48bd39889a9948
Diffstat (limited to 'runtime/class_linker.h')
-rw-r--r-- | runtime/class_linker.h | 5 |
1 files changed, 4 insertions, 1 deletions
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_); |