Index: src/compiler/arm64/instruction-selector-arm64.cc |
diff --git a/src/compiler/arm64/instruction-selector-arm64.cc b/src/compiler/arm64/instruction-selector-arm64.cc |
index 2a7b9299c22dd63a009aff89eeef70d0c8442a1b..1bcc8dc06437167f6375c53d0258dee3f6ef351f 100644 |
--- a/src/compiler/arm64/instruction-selector-arm64.cc |
+++ b/src/compiler/arm64/instruction-selector-arm64.cc |
@@ -474,7 +474,7 @@ |
opcode = cont->Encode(opcode); |
if (cont->IsDeoptimize()) { |
selector->EmitDeoptimize(opcode, output_count, outputs, input_count, inputs, |
- cont->kind(), cont->reason(), cont->frame_state()); |
+ cont->reason(), cont->frame_state()); |
} else if (cont->IsTrap()) { |
inputs[input_count++] = g.UseImmediate(cont->trap_id()); |
selector->Emit(opcode, output_count, outputs, input_count, inputs); |
@@ -1445,8 +1445,8 @@ |
g.Label(cont->true_block()), g.Label(cont->false_block())); |
} else if (cont->IsDeoptimize()) { |
InstructionOperand in[] = {result, result}; |
- selector->EmitDeoptimize(opcode, 0, nullptr, 2, in, cont->kind(), |
- cont->reason(), cont->frame_state()); |
+ selector->EmitDeoptimize(opcode, 0, nullptr, 2, in, cont->reason(), |
+ cont->frame_state()); |
} else if (cont->IsSet()) { |
selector->Emit(opcode, g.DefineAsRegister(cont->result()), result, result); |
} else { |
@@ -1795,8 +1795,8 @@ |
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, cont->kind(), |
- cont->reason(), cont->frame_state()); |
+ selector->EmitDeoptimize(opcode, g.NoOutput(), left, right, cont->reason(), |
+ cont->frame_state()); |
} else if (cont->IsSet()) { |
selector->Emit(opcode, g.DefineAsRegister(cont->result()), left, right); |
} else { |
@@ -1967,7 +1967,7 @@ |
} else { |
DCHECK(cont->IsDeoptimize()); |
selector->EmitDeoptimize(cont->Encode(opcode), g.NoOutput(), value, |
- cont->kind(), cont->reason(), cont->frame_state()); |
+ cont->reason(), cont->frame_state()); |
} |
} |
@@ -2321,7 +2321,7 @@ |
} else if (cont->IsDeoptimize()) { |
selector->EmitDeoptimize(cont->Encode(kArm64Tst32), g.NoOutput(), |
g.UseRegister(value), g.UseRegister(value), |
- cont->kind(), cont->reason(), cont->frame_state()); |
+ cont->reason(), cont->frame_state()); |
} else { |
DCHECK(cont->IsTrap()); |
selector->Emit(cont->Encode(kArm64Tst32), g.NoOutput(), |
@@ -2339,16 +2339,14 @@ |
} |
void InstructionSelector::VisitDeoptimizeIf(Node* node) { |
- DeoptimizeParameters p = DeoptimizeParametersOf(node->op()); |
FlagsContinuation cont = FlagsContinuation::ForDeoptimize( |
- kNotEqual, p.kind(), p.reason(), node->InputAt(1)); |
+ kNotEqual, DeoptimizeReasonOf(node->op()), node->InputAt(1)); |
VisitWordCompareZero(this, node, node->InputAt(0), &cont); |
} |
void InstructionSelector::VisitDeoptimizeUnless(Node* node) { |
- DeoptimizeParameters p = DeoptimizeParametersOf(node->op()); |
FlagsContinuation cont = FlagsContinuation::ForDeoptimize( |
- kEqual, p.kind(), p.reason(), node->InputAt(1)); |
+ kEqual, DeoptimizeReasonOf(node->op()), node->InputAt(1)); |
VisitWordCompareZero(this, node, node->InputAt(0), &cont); |
} |