diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/portable/mir_to_gbc.cc | 1 | ||||
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 2 | ||||
| -rw-r--r-- | compiler/image_writer.cc | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/compiler/dex/portable/mir_to_gbc.cc b/compiler/dex/portable/mir_to_gbc.cc index e5b4876f08..70b660b7ae 100644 --- a/compiler/dex/portable/mir_to_gbc.cc +++ b/compiler/dex/portable/mir_to_gbc.cc @@ -1660,7 +1660,6 @@ bool MirConverter::BlockBitcodeConversion(BasicBlock* bb) { uint16_t arg_reg = cu_->num_regs; ::llvm::Function::arg_iterator arg_iter(func_->arg_begin()); - ::llvm::Function::arg_iterator arg_end(func_->arg_end()); const char* shorty = cu_->shorty; uint32_t shorty_size = strlen(shorty); diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 8e666dd2a8..43ed28c762 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1430,7 +1430,7 @@ class ParallelCompilationManager { private: ParallelCompilationManager* const manager_; const size_t end_; - const Callback* const callback_; + Callback* const callback_; }; AtomicInteger index_; diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc index 90e2c65c89..02654ad55a 100644 --- a/compiler/image_writer.cc +++ b/compiler/image_writer.cc @@ -630,10 +630,10 @@ void ImageWriter::FixupMethod(const ArtMethod* orig, ArtMethod* copy) { copy->SetEntryPointFromCompiledCode(GetOatAddress(quick_to_interpreter_bridge_offset_)); #endif copy->SetEntryPointFromInterpreter(reinterpret_cast<EntryPointFromInterpreter*> - (GetOatAddress(interpreter_to_interpreter_bridge_offset_))); + (const_cast<byte*>(GetOatAddress(interpreter_to_interpreter_bridge_offset_)))); } else { copy->SetEntryPointFromInterpreter(reinterpret_cast<EntryPointFromInterpreter*> - (GetOatAddress(interpreter_to_compiled_code_bridge_offset_))); + (const_cast<byte*>(GetOatAddress(interpreter_to_compiled_code_bridge_offset_)))); // Use original code if it exists. Otherwise, set the code pointer to the resolution // trampoline. const byte* code = GetOatAddress(orig->GetOatCodeOffset()); |