From 1cfea7af6f38cd06393fed3e466701869ce8b2c3 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 24 May 2017 14:44:38 +0100 Subject: Code cleanup around vdex. 1) Handle the vdex in dex2oat instead of compiler_driver 2) CHECK instead of DCHECK that we don't dexlayout with vdex. Test: test.py Change-Id: Idf7be59bb25708181e391d17128480659ac697e5 --- compiler/driver/compiler_driver.cc | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 91b58e1590..2330b9a099 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -425,26 +425,6 @@ INTRINSICS_LIST(SETUP_INTRINSICS) FreeThreadPools(); } -void CompilerDriver::CompileAll(jobject class_loader, - const std::vector& dex_files, - VdexFile* vdex_file, - TimingLogger* timings) { - if (vdex_file != nullptr) { - // TODO: we unquicken unconditionnally, as we don't know - // if the boot image has changed. How exactly we'll know is under - // experimentation. - TimingLogger::ScopedTiming t("Unquicken", timings); - // We do not decompile a RETURN_VOID_NO_BARRIER into a RETURN_VOID, as the quickening - // optimization does not depend on the boot image (the optimization relies on not - // having final fields in a class, which does not change for an app). - VdexFile::Unquicken(dex_files, vdex_file->GetQuickeningInfo()); - - Runtime::Current()->GetCompilerCallbacks()->SetVerifierDeps( - new verifier::VerifierDeps(dex_files, vdex_file->GetVerifierDepsData())); - } - CompileAll(class_loader, dex_files, timings); -} - static optimizer::DexToDexCompilationLevel GetDexToDexCompilationLevel( Thread* self, const CompilerDriver& driver, Handle class_loader, const DexFile& dex_file, const DexFile::ClassDef& class_def) -- cgit v1.2.3-59-g8ed1b