Index: src/compiler/mips64/code-generator-mips64.cc |
diff --git a/src/compiler/mips64/code-generator-mips64.cc b/src/compiler/mips64/code-generator-mips64.cc |
index dffae4ae527d7f88557c0e532a675b4bbb6769f9..1cd51a1ccd8df145a9f102f7488d3b02229d4593 100644 |
--- a/src/compiler/mips64/code-generator-mips64.cc |
+++ b/src/compiler/mips64/code-generator-mips64.cc |
@@ -543,7 +543,8 @@ void CodeGenerator::AssemblePopArgumentsAdaptorFrame(Register args_reg, |
} |
// Assembles an instruction after register allocation, producing machine code. |
-void CodeGenerator::AssembleArchInstruction(Instruction* instr) { |
+CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( |
+ Instruction* instr) { |
MipsOperandConverter i(this, instr); |
InstructionCode opcode = instr->opcode(); |
ArchOpcode arch_opcode = ArchOpcodeField::decode(opcode); |
@@ -663,7 +664,9 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) { |
BuildTranslation(instr, -1, 0, OutputFrameStateCombine::Ignore()); |
Deoptimizer::BailoutType bailout_type = |
Deoptimizer::BailoutType(MiscField::decode(instr->opcode())); |
- AssembleDeoptimizerCall(deopt_state_id, bailout_type); |
+ CodeGenResult result = |
+ AssembleDeoptimizerCall(deopt_state_id, bailout_type); |
+ if (result != kSuccess) return result; |
break; |
} |
case kArchRet: |
@@ -1594,6 +1597,7 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) { |
ASSEMBLE_ATOMIC_LOAD_INTEGER(lw); |
break; |
} |
+ return kSuccess; |
} // NOLINT(readability/fn_size) |
@@ -1905,12 +1909,13 @@ void CodeGenerator::AssembleArchTableSwitch(Instruction* instr) { |
}); |
} |
- |
-void CodeGenerator::AssembleDeoptimizerCall( |
+CodeGenerator::CodeGenResult CodeGenerator::AssembleDeoptimizerCall( |
int deoptimization_id, Deoptimizer::BailoutType bailout_type) { |
Address deopt_entry = Deoptimizer::GetDeoptimizationEntry( |
isolate(), deoptimization_id, bailout_type); |
+ if (deopt_entry == nullptr) return kTooManyDeoptimizationBailouts; |
__ Call(deopt_entry, RelocInfo::RUNTIME_ENTRY); |
+ return kSuccess; |
} |
void CodeGenerator::FinishFrame(Frame* frame) { |