| Index: src/compiler/x64/code-generator-x64.cc
|
| diff --git a/src/compiler/x64/code-generator-x64.cc b/src/compiler/x64/code-generator-x64.cc
|
| index 93aa8d4dfa7e61b247418658ce7a4df2f05e17da..18ac9f9f3215b848d3a532098e8f577b909d0860 100644
|
| --- a/src/compiler/x64/code-generator-x64.cc
|
| +++ b/src/compiler/x64/code-generator-x64.cc
|
| @@ -649,7 +649,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) {
|
| X64OperandConverter i(this, instr);
|
| InstructionCode opcode = instr->opcode();
|
| ArchOpcode arch_opcode = ArchOpcodeField::decode(opcode);
|
| @@ -770,7 +771,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:
|
| @@ -1768,6 +1771,7 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| UNREACHABLE(); // Won't be generated by instruction selector.
|
| break;
|
| }
|
| + return kSuccess;
|
| } // NOLINT(readability/fn_size)
|
|
|
|
|
| @@ -1930,12 +1934,13 @@ void CodeGenerator::AssembleArchTableSwitch(Instruction* instr) {
|
| __ jmp(Operand(kScratchRegister, input, times_8, 0));
|
| }
|
|
|
| -
|
| -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;
|
| }
|
|
|
|
|
|
|