From ed6195a514e3253576af27ea9ba13038509d29ac Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 13 Jul 2015 17:02:30 +0000 Subject: Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""" Breaks again in some configurations I don't fully understand yet. This reverts commit f075879649686e59b7a9065c5a061dbfdcdfbecc. Change-Id: I0ac5533825e40b06462ee69b2740e4a96fb5c582 --- compiler/driver/compiler_driver.cc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') 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) { -- cgit v1.2.3-59-g8ed1b