diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-05-24 14:44:38 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2017-06-14 10:53:48 +0100 |
| commit | 1cfea7af6f38cd06393fed3e466701869ce8b2c3 (patch) | |
| tree | 3e3b185eeb4ce0c6a2cc3184e0305f37151261c2 /compiler/driver/compiler_driver.cc | |
| parent | d38b67c9892b603f57a6b51a1b9d7f4e610158aa (diff) | |
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
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 20 |
1 files changed, 0 insertions, 20 deletions
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<const DexFile*>& 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<mirror::ClassLoader> class_loader, const DexFile& dex_file, const DexFile::ClassDef& class_def) |