diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/oat_writer.cc | 6 | ||||
| -rw-r--r-- | compiler/optimizing/code_generator_mips64.cc | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc index c96b1715d7..4ddd457ac5 100644 --- a/compiler/oat_writer.cc +++ b/compiler/oat_writer.cc @@ -1123,11 +1123,7 @@ size_t OatWriter::InitOatCodeDexFiles(size_t offset) { } while (false) VISIT(InitCodeMethodVisitor); - // InitImageMethodVisitor visits all methods, resolves them (failing if one cannot be resolved, - // which is a bad sign for a working boot image), and then install entrypoints. - // In case of VerifyAtRuntime, there won't be code, and we do not want to resolve the methods - // (this has been skipped in the driver for performance). - if (compiler_driver_->IsImage() && !compiler_driver_->GetCompilerOptions().VerifyAtRuntime()) { + if (compiler_driver_->IsImage()) { VISIT(InitImageMethodVisitor); } diff --git a/compiler/optimizing/code_generator_mips64.cc b/compiler/optimizing/code_generator_mips64.cc index 4722e42694..f4f53d5f32 100644 --- a/compiler/optimizing/code_generator_mips64.cc +++ b/compiler/optimizing/code_generator_mips64.cc @@ -971,11 +971,11 @@ size_t CodeGeneratorMIPS64::RestoreFloatingPointRegister(size_t stack_index, uin } void CodeGeneratorMIPS64::DumpCoreRegister(std::ostream& stream, int reg) const { - stream << Mips64ManagedRegister::FromGpuRegister(GpuRegister(reg)); + stream << GpuRegister(reg); } void CodeGeneratorMIPS64::DumpFloatingPointRegister(std::ostream& stream, int reg) const { - stream << Mips64ManagedRegister::FromFpuRegister(FpuRegister(reg)); + stream << FpuRegister(reg); } void CodeGeneratorMIPS64::InvokeRuntime(QuickEntrypointEnum entrypoint, @@ -1444,12 +1444,11 @@ void InstructionCodeGeneratorMIPS64::VisitArrayLength(HArrayLength* instruction) } void LocationsBuilderMIPS64::VisitArraySet(HArraySet* instruction) { - Primitive::Type value_type = instruction->GetComponentType(); - bool is_object = value_type == Primitive::kPrimNot; + bool needs_runtime_call = instruction->NeedsTypeCheck(); LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary( instruction, - is_object ? LocationSummary::kCall : LocationSummary::kNoCall); - if (is_object) { + needs_runtime_call ? LocationSummary::kCall : LocationSummary::kNoCall); + if (needs_runtime_call) { InvokeRuntimeCallingConvention calling_convention; locations->SetInAt(0, Location::RegisterLocation(calling_convention.GetRegisterAt(0))); locations->SetInAt(1, Location::RegisterLocation(calling_convention.GetRegisterAt(1))); |