From f075879649686e59b7a9065c5a061dbfdcdfbecc Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Mon, 13 Jul 2015 11:56:00 +0000 Subject: Revert "Revert "Make dex2dex return a CompiledMethod after quickening."" This reverts commit 327c5ed30a1f016ef3e1bb26ea7b4abd34eb63b9. Change-Id: I0dc5d92e5d1ef98830fbd3c40ec59a93f9e0422d --- compiler/driver/compiler_driver.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'compiler/driver/compiler_driver.h') diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index 2d7ceaeea1..5cf4044fd4 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -675,12 +675,13 @@ class CompilerDriver { typedef void (*CompilerCallbackFn)(CompilerDriver& driver); typedef MutexLock* (*CompilerMutexLockFn)(CompilerDriver& driver); - typedef void (*DexToDexCompilerFn)(CompilerDriver& driver, - const DexFile::CodeItem* code_item, - uint32_t access_flags, InvokeType invoke_type, - uint32_t class_dex_idx, uint32_t method_idx, - jobject class_loader, const DexFile& dex_file, - DexToDexCompilationLevel dex_to_dex_compilation_level); + typedef CompiledMethod* (*DexToDexCompilerFn)( + CompilerDriver& driver, + const DexFile::CodeItem* code_item, + uint32_t access_flags, InvokeType invoke_type, + uint32_t class_dex_idx, uint32_t method_idx, + jobject class_loader, const DexFile& dex_file, + DexToDexCompilationLevel dex_to_dex_compilation_level); DexToDexCompilerFn dex_to_dex_compiler_; void* compiler_context_; -- cgit v1.2.3-59-g8ed1b