summaryrefslogtreecommitdiff
path: root/compiler/driver/compiler_driver.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2015-07-13 11:53:56 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2015-07-13 11:53:56 +0000
commit327c5ed30a1f016ef3e1bb26ea7b4abd34eb63b9 (patch)
tree55d58d66f154edade95e909a6badf3bb43f75be9 /compiler/driver/compiler_driver.cc
parent6920703c8eae0d90528ea09945e742582b6f8198 (diff)
Revert "Make dex2dex return a CompiledMethod after quickening."
Build failures on arm/arm64. This reverts commit 6920703c8eae0d90528ea09945e742582b6f8198. Change-Id: I0dd5426610150937dac6e4d9dd9aa759bdf7fca4
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
-rw-r--r--compiler/driver/compiler_driver.cc14
1 files changed, 4 insertions, 10 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index a52bfaeb5b..7890108f41 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -2291,16 +2291,10 @@ void CompilerDriver::CompileMethod(Thread* self, const DexFile::CodeItem* code_i
// TODO: add a command-line option to disable DEX-to-DEX compilation ?
// Do not optimize if a VerifiedMethod is missing. SafeCast elision, for example, relies on
// it.
- compiled_method = (*dex_to_dex_compiler_)(
- *this,
- code_item,
- access_flags,
- invoke_type,
- class_def_idx,
- method_idx,
- class_loader,
- dex_file,
- has_verified_method ? dex_to_dex_compilation_level : kRequired);
+ (*dex_to_dex_compiler_)(*this, code_item, access_flags,
+ invoke_type, class_def_idx,
+ method_idx, class_loader, dex_file,
+ has_verified_method ? dex_to_dex_compilation_level : kRequired);
}
}
if (kTimeCompileMethod) {