| Index: src/compiler/arm/code-generator-arm.cc
|
| diff --git a/src/compiler/arm/code-generator-arm.cc b/src/compiler/arm/code-generator-arm.cc
|
| index b9f825123aa9888346c3f9fb75e3d77b4b02d093..d457e22fa3528529912ac739b454999c6d61fc9b 100644
|
| --- a/src/compiler/arm/code-generator-arm.cc
|
| +++ b/src/compiler/arm/code-generator-arm.cc
|
| @@ -737,10 +737,8 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
|
| case kArchDeoptimize: {
|
| int deopt_state_id =
|
| BuildTranslation(instr, -1, 0, OutputFrameStateCombine::Ignore());
|
| - Deoptimizer::BailoutType bailout_type =
|
| - Deoptimizer::BailoutType(MiscField::decode(instr->opcode()));
|
| - CodeGenResult result = AssembleDeoptimizerCall(
|
| - deopt_state_id, bailout_type, current_source_position_);
|
| + CodeGenResult result =
|
| + AssembleDeoptimizerCall(deopt_state_id, current_source_position_);
|
| if (result != kSuccess) return result;
|
| break;
|
| }
|
| @@ -2108,16 +2106,19 @@ void CodeGenerator::AssembleArchTableSwitch(Instruction* instr) {
|
| }
|
|
|
| CodeGenerator::CodeGenResult CodeGenerator::AssembleDeoptimizerCall(
|
| - int deoptimization_id, Deoptimizer::BailoutType bailout_type,
|
| - SourcePosition pos) {
|
| + int deoptimization_id, SourcePosition pos) {
|
| + DeoptimizeKind deoptimization_kind = GetDeoptimizationKind(deoptimization_id);
|
| + DeoptimizeReason deoptimization_reason =
|
| + GetDeoptimizationReason(deoptimization_id);
|
| + Deoptimizer::BailoutType bailout_type =
|
| + deoptimization_kind == DeoptimizeKind::kSoft ? Deoptimizer::SOFT
|
| + : Deoptimizer::EAGER;
|
| Address deopt_entry = Deoptimizer::GetDeoptimizationEntry(
|
| isolate(), deoptimization_id, bailout_type);
|
| // TODO(turbofan): We should be able to generate better code by sharing the
|
| // actual final call site and just bl'ing to it here, similar to what we do
|
| // in the lithium backend.
|
| if (deopt_entry == nullptr) return kTooManyDeoptimizationBailouts;
|
| - DeoptimizeReason deoptimization_reason =
|
| - GetDeoptimizationReason(deoptimization_id);
|
| __ RecordDeoptReason(deoptimization_reason, pos, deoptimization_id);
|
| __ Call(deopt_entry, RelocInfo::RUNTIME_ENTRY);
|
| __ CheckConstPool(false, false);
|
|
|