| Index: src/compiler/s390/instruction-selector-s390.cc
|
| diff --git a/src/compiler/s390/instruction-selector-s390.cc b/src/compiler/s390/instruction-selector-s390.cc
|
| index d5d5e079fa09546219ff74bbaa4a8cbfffc2c4f4..3825684921f09806857a9d215fa6eec7ec86e760 100644
|
| --- a/src/compiler/s390/instruction-selector-s390.cc
|
| +++ b/src/compiler/s390/instruction-selector-s390.cc
|
| @@ -417,6 +417,9 @@ void VisitBinop(InstructionSelector* selector, Node* node,
|
| if (cont->IsDeoptimize()) {
|
| selector->EmitDeoptimize(opcode, output_count, outputs, input_count, inputs,
|
| 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);
|
| } else {
|
| selector->Emit(opcode, output_count, outputs, input_count, inputs);
|
| }
|
| @@ -1722,9 +1725,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.DefineAsRegister(cont->result()), left, right);
|
| + } else {
|
| + DCHECK(cont->IsTrap());
|
| + selector->Emit(opcode, g.NoOutput(), left, right,
|
| + g.UseImmediate(cont->trap_id()));
|
| }
|
| }
|
|
|
| @@ -2005,12 +2011,16 @@ void InstructionSelector::VisitDeoptimizeUnless(Node* node) {
|
| }
|
|
|
| void InstructionSelector::VisitTrapIf(Node* node, Runtime::FunctionId func_id) {
|
| - UNREACHABLE();
|
| + FlagsContinuation cont =
|
| + FlagsContinuation::ForTrap(kNotEqual, func_id, node->InputAt(1));
|
| + VisitWord32CompareZero(this, node, node->InputAt(0), &cont);
|
| }
|
|
|
| void InstructionSelector::VisitTrapUnless(Node* node,
|
| Runtime::FunctionId func_id) {
|
| - UNREACHABLE();
|
| + FlagsContinuation cont =
|
| + FlagsContinuation::ForTrap(kEqual, func_id, node->InputAt(1));
|
| + VisitWord32CompareZero(this, node, node->InputAt(0), &cont);
|
| }
|
|
|
| void InstructionSelector::VisitSwitch(Node* node, const SwitchInfo& sw) {
|
|
|