diff options
| author | 2013-07-24 17:09:43 -0700 | |
|---|---|---|
| committer | 2013-07-24 17:10:28 -0700 | |
| commit | e5e4cd8e5be53b7942a436fddd9579415432585f (patch) | |
| tree | 06a7ef4e36820b6a031fb747f26f35ac635bcb48 /compiler/driver/compiler_driver.cc | |
| parent | 21a5f6959d1429100e1c16ddabe10cde2bfeb121 (diff) | |
| parent | a517fd700eddcfa24197e6c221f8ad6e3a5d518b (diff) | |
Merge remote-tracking branch 'goog/dalvik-dev' into merge-art-to-master
Change-Id: Ia18da3d59fc0043ae9cb2ee5cc0cd2fac00fdc47
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 593b8e1cfb..486c536956 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -2252,7 +2252,7 @@ void CompilerDriver::CompileMethod(const DexFile::CodeItem* code_item, uint32_t CompilerFn compiler = compiler_; #ifdef ART_SEA_IR_MODE bool use_sea = Runtime::Current()->IsSeaIRMode(); - use_sea &&= (std::string::npos != PrettyMethod(method_idx, dex_file).find("fibonacci")); + use_sea = use_sea && (std::string::npos != PrettyMethod(method_idx, dex_file).find("fibonacci")); if (use_sea) { compiler = sea_ir_compiler_; } @@ -2343,13 +2343,13 @@ bool CompilerDriver::RequiresConstructorBarrier(Thread* self, const DexFile* dex bool CompilerDriver::WriteElf(const std::string& android_root, bool is_host, const std::vector<const art::DexFile*>& dex_files, - std::vector<uint8_t>& oat_contents, + OatWriter& oat_writer, art::File* file) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(ART_USE_PORTABLE_COMPILER) - return art::ElfWriterMclinker::Create(file, oat_contents, dex_files, android_root, is_host, *this); + return art::ElfWriterMclinker::Create(file, oat_writer, dex_files, android_root, is_host, *this); #else - return art::ElfWriterQuick::Create(file, oat_contents, dex_files, android_root, is_host, *this); + return art::ElfWriterQuick::Create(file, oat_writer, dex_files, android_root, is_host, *this); #endif } void CompilerDriver::InstructionSetToLLVMTarget(InstructionSet instruction_set, |