commit 7de5dfe37f3cf24e1166412b589f6f67dcd1f1c0
author Nicolas Geoffray <ngeoffray@google.com> Tue Sep 22 09:48:02 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Sep 22 09:48:02 2015 +0000
tree a87eeac15fd485bb14ea8ace2b2bc839c4c253be
parent 356412e2b7ba3fde164bc08a44fee0ddc19c54e1

Revert "Add one LinearAlloc per ClassLoader"

Times out on 32bit target/host for 132-daemon-locks-shutdown test.

Bug: 22720414

This reverts commit 356412e2b7ba3fde164bc08a44fee0ddc19c54e1.

Change-Id: I5ab3a09e88a5ad8c306a27d2606ecbecc80b9326

runtime/jit/jit_code_cache_test.cc

diff --git a/runtime/jit/jit_code_cache_test.cc b/runtime/jit/jit_code_cache_test.cc
index c76dc11..a6cbb71 100644
--- a/runtime/jit/jit_code_cache_test.cc
+++ b/runtime/jit/jit_code_cache_test.cc
@@ -49,11 +49,8 @@
   ASSERT_TRUE(reserved_code != nullptr);
   ASSERT_TRUE(code_cache->ContainsCodePtr(reserved_code));
   ASSERT_EQ(code_cache->NumMethods(), 1u);
-  Runtime* const runtime = Runtime::Current();
-  ClassLinker* const class_linker = runtime->GetClassLinker();
-  ArtMethod* method = &class_linker->AllocArtMethodArray(soa.Self(),
-                                                         runtime->GetLinearAlloc(),
-                                                         1)->At(0);
+  ClassLinker* const cl = Runtime::Current()->GetClassLinker();
+  ArtMethod* method = &cl->AllocArtMethodArray(soa.Self(), 1)->At(0);
   ASSERT_FALSE(code_cache->ContainsMethod(method));
   method->SetEntryPointFromQuickCompiledCode(reserved_code);
   ASSERT_TRUE(code_cache->ContainsMethod(method));