| Index: src/compiler/x64/instruction-selector-x64.cc
|
| diff --git a/src/compiler/x64/instruction-selector-x64.cc b/src/compiler/x64/instruction-selector-x64.cc
|
| index 676483c978a5f230d4fbe976eccfdf172973a5fa..ef82119e82b26fb997293aee0e7d6002827f7286 100644
|
| --- a/src/compiler/x64/instruction-selector-x64.cc
|
| +++ b/src/compiler/x64/instruction-selector-x64.cc
|
| @@ -440,7 +440,7 @@ static void VisitBinop(InstructionSelector* selector, Node* node,
|
| opcode = cont->Encode(opcode);
|
| if (cont->IsDeoptimize()) {
|
| selector->EmitDeoptimize(opcode, output_count, outputs, input_count, inputs,
|
| - cont->frame_state());
|
| + cont->reason(), cont->frame_state());
|
| } else {
|
| selector->Emit(opcode, output_count, outputs, input_count, inputs);
|
| }
|
| @@ -1506,7 +1506,7 @@ void VisitCompareWithMemoryOperand(InstructionSelector* selector,
|
| selector->Emit(opcode, 0, nullptr, input_count, inputs);
|
| } else if (cont->IsDeoptimize()) {
|
| selector->EmitDeoptimize(opcode, 0, nullptr, input_count, inputs,
|
| - cont->frame_state());
|
| + cont->reason(), cont->frame_state());
|
| } else {
|
| DCHECK(cont->IsSet());
|
| InstructionOperand output = g.DefineAsRegister(cont->result());
|
| @@ -1524,7 +1524,7 @@ void VisitCompare(InstructionSelector* selector, InstructionCode opcode,
|
| selector->Emit(opcode, g.NoOutput(), left, right,
|
| g.Label(cont->true_block()), g.Label(cont->false_block()));
|
| } else if (cont->IsDeoptimize()) {
|
| - selector->EmitDeoptimize(opcode, g.NoOutput(), left, right,
|
| + selector->EmitDeoptimize(opcode, g.NoOutput(), left, right, cont->reason(),
|
| cont->frame_state());
|
| } else {
|
| DCHECK(cont->IsSet());
|
| @@ -1641,7 +1641,7 @@ void VisitWord64Compare(InstructionSelector* selector, Node* node,
|
| selector->Emit(opcode, g.NoOutput(), g.Label(cont->true_block()),
|
| g.Label(cont->false_block()));
|
| } else if (cont->IsDeoptimize()) {
|
| - selector->EmitDeoptimize(opcode, 0, nullptr, 0, nullptr,
|
| + selector->EmitDeoptimize(opcode, 0, nullptr, 0, nullptr, cont->reason(),
|
| cont->frame_state());
|
| } else {
|
| DCHECK(cont->IsSet());
|
| @@ -1825,14 +1825,14 @@ void InstructionSelector::VisitBranch(Node* branch, BasicBlock* tbranch,
|
| }
|
|
|
| void InstructionSelector::VisitDeoptimizeIf(Node* node) {
|
| - FlagsContinuation cont =
|
| - FlagsContinuation::ForDeoptimize(kNotEqual, node->InputAt(1));
|
| + FlagsContinuation cont = FlagsContinuation::ForDeoptimize(
|
| + kNotEqual, DeoptimizeReasonOf(node->op()), node->InputAt(1));
|
| VisitWordCompareZero(this, node, node->InputAt(0), &cont);
|
| }
|
|
|
| void InstructionSelector::VisitDeoptimizeUnless(Node* node) {
|
| - FlagsContinuation cont =
|
| - FlagsContinuation::ForDeoptimize(kEqual, node->InputAt(1));
|
| + FlagsContinuation cont = FlagsContinuation::ForDeoptimize(
|
| + kEqual, DeoptimizeReasonOf(node->op()), node->InputAt(1));
|
| VisitWordCompareZero(this, node, node->InputAt(0), &cont);
|
| }
|
|
|
|
|