Index: src/compiler/x87/instruction-selector-x87.cc |
diff --git a/src/compiler/x87/instruction-selector-x87.cc b/src/compiler/x87/instruction-selector-x87.cc |
index 1dc18879cbedfd5fc24b8da5f12b3c7b2399c483..961682bded63c9edbe70bf3cd42ac7f477b00f26 100644 |
--- a/src/compiler/x87/instruction-selector-x87.cc |
+++ b/src/compiler/x87/instruction-selector-x87.cc |
@@ -459,7 +459,7 @@ 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); |
} |
@@ -1178,7 +1178,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()); |
@@ -1196,7 +1196,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()); |
@@ -1259,7 +1259,7 @@ void VisitFloat32Compare(InstructionSelector* selector, Node* node, |
} else if (cont->IsDeoptimize()) { |
selector->EmitDeoptimize(cont->Encode(kX87Float32Cmp), g.NoOutput(), |
g.Use(node->InputAt(0)), g.Use(node->InputAt(1)), |
- cont->frame_state()); |
+ cont->reason(), cont->frame_state()); |
} else { |
DCHECK(cont->IsSet()); |
selector->Emit(cont->Encode(kX87Float32Cmp), |
@@ -1280,7 +1280,7 @@ void VisitFloat64Compare(InstructionSelector* selector, Node* node, |
} else if (cont->IsDeoptimize()) { |
selector->EmitDeoptimize(cont->Encode(kX87Float64Cmp), g.NoOutput(), |
g.Use(node->InputAt(0)), g.Use(node->InputAt(1)), |
- cont->frame_state()); |
+ cont->reason(), cont->frame_state()); |
} else { |
DCHECK(cont->IsSet()); |
selector->Emit(cont->Encode(kX87Float64Cmp), |
@@ -1359,7 +1359,7 @@ void VisitWordCompare(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()); |
@@ -1474,14 +1474,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); |
} |