diff options
| author | 2016-06-03 17:47:32 -0700 | |
|---|---|---|
| committer | 2016-06-06 11:26:32 -0700 | |
| commit | c9dbb1df3b5c06ba122cacaf35b17cb53c6be3c6 (patch) | |
| tree | d9b8f3c81c0abc7ce6839d0723271ee9740a267c /compiler/driver/compiler_driver.cc | |
| parent | f102faf1bcbdb2149e3e7bf27b1819f621b7894b (diff) | |
Revert "Revert "Hold dex caches live in class table""
Bug: 29083330
This reverts commit f102faf1bcbdb2149e3e7bf27b1819f621b7894b.
Change-Id: Ibc6d260247b3113beec7d33552061512a36c9ce8
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index e366e071f5..f88337ee6e 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1113,9 +1113,8 @@ void CompilerDriver::LoadImageClasses(TimingLogger* timings) { uint16_t exception_type_idx = exception_type.first; const DexFile* dex_file = exception_type.second; StackHandleScope<2> hs2(self); - Handle<mirror::DexCache> dex_cache(hs2.NewHandle(class_linker->RegisterDexFile( - *dex_file, - Runtime::Current()->GetLinearAlloc()))); + Handle<mirror::DexCache> dex_cache(hs2.NewHandle(class_linker->RegisterDexFile(*dex_file, + nullptr))); Handle<mirror::Class> klass(hs2.NewHandle( class_linker->ResolveType(*dex_file, exception_type_idx, @@ -2156,7 +2155,7 @@ class ResolveTypeVisitor : public CompilationVisitor { hs.NewHandle(soa.Decode<mirror::ClassLoader*>(manager_->GetClassLoader()))); Handle<mirror::DexCache> dex_cache(hs.NewHandle(class_linker->RegisterDexFile( dex_file, - class_linker->GetOrCreateAllocatorForClassLoader(class_loader.Get())))); + class_loader.Get()))); mirror::Class* klass = class_linker->ResolveType(dex_file, type_idx, dex_cache, class_loader); if (klass == nullptr) { |