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_test.cc | |
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_test.cc')
-rw-r--r-- | runtime/class_linker_test.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 53908d8c0b..c561c4d591 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -1544,9 +1544,8 @@ TEST_F(ClassLinkerTest, RegisterDexFileName) { nullptr, nullptr)); // Make a copy of the dex cache with changed name. - dex_cache.Assign(class_linker->AllocAndInitializeDexCache(Thread::Current(), - *dex_file, - /* class_loader= */ nullptr)); + LinearAlloc* alloc = Runtime::Current()->GetLinearAlloc(); + dex_cache.Assign(class_linker->AllocAndInitializeDexCache(Thread::Current(), *dex_file, alloc)); DCHECK_EQ(dex_cache->GetLocation()->CompareTo(location.Get()), 0); { WriterMutexLock mu(soa.Self(), *Locks::dex_lock_); |