From c9dbb1df3b5c06ba122cacaf35b17cb53c6be3c6 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 3 Jun 2016 17:47:32 -0700 Subject: Revert "Revert "Hold dex caches live in class table"" Bug: 29083330 This reverts commit f102faf1bcbdb2149e3e7bf27b1819f621b7894b. Change-Id: Ibc6d260247b3113beec7d33552061512a36c9ce8 --- compiler/driver/compiler_driver-inl.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'compiler/driver/compiler_driver-inl.h') diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h index 3cb63e7082..94f5acc2b6 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -390,9 +390,8 @@ inline int CompilerDriver::IsFastInvoke( *devirt_target->dex_file, devirt_target->dex_method_index, dex_cache, class_loader, nullptr, kVirtual); } else { - auto target_dex_cache(hs.NewHandle(class_linker->RegisterDexFile( - *devirt_target->dex_file, - class_linker->GetOrCreateAllocatorForClassLoader(class_loader.Get())))); + auto target_dex_cache(hs.NewHandle(class_linker->RegisterDexFile(*devirt_target->dex_file, + class_loader.Get()))); called_method = class_linker->ResolveMethod( *devirt_target->dex_file, devirt_target->dex_method_index, target_dex_cache, class_loader, nullptr, kVirtual); -- cgit v1.2.3-59-g8ed1b