diff options
author | 2015-07-13 17:02:42 +0000 | |
---|---|---|
committer | 2015-07-13 17:02:44 +0000 | |
commit | f68c8545382925062da2b87169ca2b5314f0b431 (patch) | |
tree | 3d8bc5b5f09ec58135a883a7b7f2c96654b91f30 /compiler/driver/compiler_driver.h | |
parent | 6fb5b1bdd5cfcc3c32fedd6539670b01b5cda9a2 (diff) | |
parent | ed6195a514e3253576af27ea9ba13038509d29ac (diff) |
Merge "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""""
Diffstat (limited to 'compiler/driver/compiler_driver.h')
-rw-r--r-- | compiler/driver/compiler_driver.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index 5cf4044fd4..2d7ceaeea1 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -675,13 +675,12 @@ class CompilerDriver { typedef void (*CompilerCallbackFn)(CompilerDriver& driver); typedef MutexLock* (*CompilerMutexLockFn)(CompilerDriver& driver); - 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); + 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); DexToDexCompilerFn dex_to_dex_compiler_; void* compiler_context_; |