From c04c800e7bda94abfadc8c2d30f58c50b261b612 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 14 Jul 2015 11:37:54 +0100 Subject: Revert "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""" This reverts commit ed6195a514e3253576af27ea9ba13038509d29ac. Change-Id: Icb58854301e8982147cdebe3edf2e0d9e0a63a56 --- compiler/driver/compiler_driver.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 7890108f41..a52bfaeb5b 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -2291,10 +2291,16 @@ 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. - (*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); + 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); } } if (kTimeCompileMethod) { -- cgit v1.2.3-59-g8ed1b