diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-04-04 15:07:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-04 15:07:26 +0000 |
| commit | 6cea2a6c42d3a4871e3b64fe55abcb5ffc8f09de (patch) | |
| tree | dc8af9b0827472d3065a5d19de5b2dbdaf849589 | |
| parent | 764c798b57b7baa04885fcdf5eba5708a01b9edc (diff) | |
| parent | 17965ed6ec29407599a0bcd4ea92532424294fed (diff) | |
| download | art-6cea2a6c42d3a4871e3b64fe55abcb5ffc8f09de.zip art-6cea2a6c42d3a4871e3b64fe55abcb5ffc8f09de.tar.gz art-6cea2a6c42d3a4871e3b64fe55abcb5ffc8f09de.tar.bz2 | |
Merge "Re-enable DEX-to-DEX compilation path"
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index b12b6a7..a241d51 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1898,8 +1898,9 @@ void CompilerDriver::CompileMethod(const DexFile::CodeItem* code_item, uint32_t compiled_method = compiler_->Compile( *this, code_item, access_flags, invoke_type, class_def_idx, method_idx, class_loader, dex_file); - } else if (dex_to_dex_compilation_level != kDontDexToDexCompile) { - // TODO: add a mode to disable DEX-to-DEX compilation ? + } + if (compiled_method == nullptr && dex_to_dex_compilation_level != kDontDexToDexCompile) { + // TODO: add a command-line option to disable DEX-to-DEX compilation ? (*dex_to_dex_compiler_)(*this, code_item, access_flags, invoke_type, class_def_idx, method_idx, class_loader, dex_file, |