Index: src/compiler/change-lowering.cc |
diff --git a/src/compiler/change-lowering.cc b/src/compiler/change-lowering.cc |
index fd425c28850690ddf4e9156d4b09c2bc0d429eff..7ddc751ab53199af0e8fc501b6f7eb12215f0d3c 100644 |
--- a/src/compiler/change-lowering.cc |
+++ b/src/compiler/change-lowering.cc |
@@ -22,13 +22,9 @@ Reduction ChangeLowering::Reduce(Node* node) { |
Node* control = graph()->start(); |
switch (node->opcode()) { |
case IrOpcode::kChangeBitToBool: |
- return ChangeBitToBool(node->InputAt(0)); |
+ return ChangeBitToBool(node->InputAt(0), control); |
case IrOpcode::kChangeBoolToBit: |
return ChangeBoolToBit(node->InputAt(0)); |
- case IrOpcode::kChangeWord32ToBit: |
- return ChangeWord32ToBit(node->InputAt(0)); |
- case IrOpcode::kChangeWord64ToBit: |
- return ChangeWord64ToBit(node->InputAt(0)); |
case IrOpcode::kChangeFloat64ToTagged: |
return ChangeFloat64ToTagged(node->InputAt(0), control); |
case IrOpcode::kChangeInt32ToTagged: |
@@ -142,35 +138,17 @@ Node* ChangeLowering::Uint32LessThanOrEqual(Node* lhs, Node* rhs) { |
} |
-Reduction ChangeLowering::ChangeBitToBool(Node* value) { |
+Reduction ChangeLowering::ChangeBitToBool(Node* val, Node* control) { |
MachineType const type = static_cast<MachineType>(kTypeBool | kRepTagged); |
- return Replace(graph()->NewNode(common()->Select(type), value, |
+ return Replace(graph()->NewNode(common()->Select(type), val, |
jsgraph()->TrueConstant(), |
jsgraph()->FalseConstant())); |
} |
-Reduction ChangeLowering::ChangeBoolToBit(Node* value) { |
- return Replace(graph()->NewNode(machine()->WordEqual(), value, |
- jsgraph()->TrueConstant())); |
-} |
- |
- |
-Reduction ChangeLowering::ChangeWord32ToBit(Node* value) { |
- return Replace( |
- graph()->NewNode(machine()->Word32Equal(), |
- graph()->NewNode(machine()->Word32Equal(), value, |
- jsgraph()->Int32Constant(0)), |
- jsgraph()->Int32Constant(0))); |
-} |
- |
- |
-Reduction ChangeLowering::ChangeWord64ToBit(Node* value) { |
+Reduction ChangeLowering::ChangeBoolToBit(Node* val) { |
return Replace( |
- graph()->NewNode(machine()->Word32Equal(), |
- graph()->NewNode(machine()->Word64Equal(), value, |
- jsgraph()->Int64Constant(0)), |
- jsgraph()->Int32Constant(0))); |
+ graph()->NewNode(machine()->WordEqual(), val, jsgraph()->TrueConstant())); |
} |