Index: src/compiler/ia32/instruction-selector-ia32.cc |
diff --git a/src/compiler/ia32/instruction-selector-ia32.cc b/src/compiler/ia32/instruction-selector-ia32.cc |
index c7060f9e1631667aeecee3327763b5a5654181e0..50aef378218db89cdf87e50d311e5392a981f203 100644 |
--- a/src/compiler/ia32/instruction-selector-ia32.cc |
+++ b/src/compiler/ia32/instruction-selector-ia32.cc |
@@ -1208,10 +1208,13 @@ void VisitCompareWithMemoryOperand(InstructionSelector* selector, |
} else if (cont->IsDeoptimize()) { |
selector->EmitDeoptimize(opcode, 0, nullptr, input_count, inputs, |
cont->reason(), cont->frame_state()); |
- } else { |
- DCHECK(cont->IsSet()); |
+ } else if (cont->IsSet()) { |
InstructionOperand output = g.DefineAsRegister(cont->result()); |
selector->Emit(opcode, 1, &output, input_count, inputs); |
+ } else { |
+ DCHECK(cont->IsTrap()); |
+ inputs[input_count++] = g.UseImmediate(cont->trap_id()); |
+ selector->Emit(opcode, 0, nullptr, input_count, inputs); |
} |
} |
@@ -1227,9 +1230,12 @@ void VisitCompare(InstructionSelector* selector, InstructionCode opcode, |
} else if (cont->IsDeoptimize()) { |
selector->EmitDeoptimize(opcode, g.NoOutput(), left, right, cont->reason(), |
cont->frame_state()); |
- } else { |
- DCHECK(cont->IsSet()); |
+ } else if (cont->IsSet()) { |
selector->Emit(opcode, g.DefineAsByteRegister(cont->result()), left, right); |
+ } else { |
+ DCHECK(cont->IsTrap()); |
+ selector->Emit(opcode, g.NoOutput(), left, right, |
+ g.UseImmediate(cont->trap_id())); |
} |
} |
@@ -1501,9 +1507,18 @@ void InstructionSelector::VisitDeoptimizeUnless(Node* node) { |
VisitWordCompareZero(this, node, node->InputAt(0), &cont); |
} |
-void InstructionSelector::VisitTrapIf(Node* node) { UNREACHABLE(); } |
+void InstructionSelector::VisitTrapIf(Node* node) { |
+ FlagsContinuation cont = FlagsContinuation::ForTrap( |
+ kNotEqual, OpParameter<Runtime::FunctionId>(node->op()), |
+ node->InputAt(1)); |
+ VisitWordCompareZero(this, node, node->InputAt(0), &cont); |
+} |
-void InstructionSelector::VisitTrapUnless(Node* node) { UNREACHABLE(); } |
+void InstructionSelector::VisitTrapUnless(Node* node) { |
+ FlagsContinuation cont = FlagsContinuation::ForTrap( |
+ kEqual, OpParameter<Runtime::FunctionId>(node->op()), node->InputAt(1)); |
+ VisitWordCompareZero(this, node, node->InputAt(0), &cont); |
+} |
void InstructionSelector::VisitSwitch(Node* node, const SwitchInfo& sw) { |
IA32OperandGenerator g(this); |