| 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 abe954d1e2bdbafc736d1eba8a22f72bb636655f..091dd60a31da08612624b1f907289be2fc66e522 100644
|
| --- a/src/compiler/x64/code-generator-x64.cc
|
| +++ b/src/compiler/x64/code-generator-x64.cc
|
| @@ -215,7 +215,7 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| break;
|
| case kArchDeoptimize: {
|
| int deoptimization_id = MiscField::decode(instr->opcode());
|
| - BuildTranslation(instr, deoptimization_id);
|
| + BuildTranslation(instr, 0, deoptimization_id);
|
|
|
| Address deopt_entry = Deoptimizer::GetDeoptimizationEntry(
|
| isolate(), deoptimization_id, Deoptimizer::LAZY);
|
| @@ -418,12 +418,9 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| int entry = Code::kHeaderSize - kHeapObjectTag;
|
| __ Call(Operand(reg, entry));
|
| }
|
| - RecordSafepoint(instr->pointer_map(), Safepoint::kSimple, 0,
|
| - Safepoint::kNoLazyDeopt);
|
| - bool lazy_deopt = (MiscField::decode(instr->opcode()) == 1);
|
| - if (lazy_deopt) {
|
| - RecordLazyDeoptimizationEntry(instr);
|
| - }
|
| +
|
| + AddSafepointAndDeopt(instr);
|
| +
|
| AddNopForSmiCodeInlining();
|
| break;
|
| }
|
| @@ -448,9 +445,7 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
|
| __ movp(rsi, FieldOperand(func, JSFunction::kContextOffset));
|
| __ Call(FieldOperand(func, JSFunction::kCodeEntryOffset));
|
|
|
| - RecordSafepoint(instr->pointer_map(), Safepoint::kSimple, 0,
|
| - Safepoint::kNoLazyDeopt);
|
| - RecordLazyDeoptimizationEntry(instr);
|
| + AddSafepointAndDeopt(instr);
|
| break;
|
| }
|
| case kSSEFloat64Cmp: {
|
|
|