Chromium Code Reviews| Index: src/compiler/simplified-lowering.cc |
| diff --git a/src/compiler/simplified-lowering.cc b/src/compiler/simplified-lowering.cc |
| index 5b29d4bb3ce021de03804d285ee8a7b36ea6e9c6..285b321d8f084dd7e5e702bd715567db6311eaaa 100644 |
| --- a/src/compiler/simplified-lowering.cc |
| +++ b/src/compiler/simplified-lowering.cc |
| @@ -1038,9 +1038,17 @@ class RepresentationSelector { |
| Node* frame_state = NodeProperties::FindFrameStateBefore(node); |
| Node* arith = graph()->NewNode(op, node->InputAt(0), node->InputAt(1)); |
| Node* overflow = graph()->NewNode(common()->Projection(1), arith); |
| - control = effect = graph()->NewNode(common()->DeoptimizeIf(), overflow, |
| - frame_state, effect, control); |
| + // Deoptimize on overflow. |
|
Benedikt Meurer
2016/06/07 04:11:00
This change doesn't seem related to comparisons?
Jarin
2016/06/09 13:37:32
Done.
|
| + Node* branch = graph()->NewNode(common()->Branch(BranchHint::kFalse), |
| + overflow, control); |
| + Node* if_true = graph()->NewNode(common()->IfTrue(), branch); |
| + Node* deoptimize = |
| + graph()->NewNode(common()->Deoptimize(DeoptimizeKind::kEager), |
| + frame_state, effect, if_true); |
| + NodeProperties::MergeControlToEnd(graph(), common(), deoptimize); |
| + |
| + control = graph()->NewNode(common()->IfFalse(), branch); |
| Node* value = graph()->NewNode(common()->Projection(0), arith); |
| ReplaceEffectControlUses(node, effect, control); |
| DeferReplacement(node, value); |
| @@ -1219,11 +1227,13 @@ class RepresentationSelector { |
| case IrOpcode::kNumberLessThan: |
| case IrOpcode::kNumberLessThanOrEqual: { |
| // Number comparisons reduce to integer comparisons for integer inputs. |
| - if (BothInputsAreSigned32(node)) { |
| + if (TypeOf(node->InputAt(0))->Is(Type::Signed32()) && |
| + TypeOf(node->InputAt(1))->Is(Type::Signed32())) { |
| // => signed Int32Cmp |
| VisitInt32Cmp(node); |
| if (lower()) NodeProperties::ChangeOp(node, Int32Op(node)); |
| - } else if (BothInputsAreUnsigned32(node)) { |
| + } else if (TypeOf(node->InputAt(0))->Is(Type::Unsigned32()) && |
| + TypeOf(node->InputAt(1))->Is(Type::Unsigned32())) { |
| // => unsigned Int32Cmp |
| VisitUint32Cmp(node); |
| if (lower()) NodeProperties::ChangeOp(node, Uint32Op(node)); |
| @@ -1239,6 +1249,41 @@ class RepresentationSelector { |
| case IrOpcode::kSpeculativeNumberSubtract: |
| return VisitSpeculativeAdditiveOp(node, truncation, lowering); |
| + case IrOpcode::kSpeculativeNumberLessThan: |
| + case IrOpcode::kSpeculativeNumberLessThanOrEqual: |
| + case IrOpcode::kSpeculativeNumberEqual: { |
| + // Number comparisons reduce to integer comparisons for integer inputs. |
| + if (TypeOf(node->InputAt(0))->Is(Type::Signed32()) && |
| + TypeOf(node->InputAt(1))->Is(Type::Signed32())) { |
| + // => signed Int32Cmp |
| + VisitInt32Cmp(node); |
| + if (lower()) ChangeToPureOp(node, Int32Op(node)); |
| + return; |
| + } else if (TypeOf(node->InputAt(0))->Is(Type::Unsigned32()) && |
| + TypeOf(node->InputAt(1))->Is(Type::Unsigned32())) { |
| + // => unsigned Int32Cmp |
| + VisitUint32Cmp(node); |
| + if (lower()) ChangeToPureOp(node, Uint32Op(node)); |
| + return; |
| + } |
| + // Try to use type feedback. |
| + CompareOperationHints::Hint hint = CompareOperationHintOf(node->op()); |
| + |
| + if (hint == CompareOperationHints::kSignedSmall || |
| + hint == CompareOperationHints::kSigned32) { |
| + VisitBinop(node, UseInfo::CheckedSigned32AsWord32(), |
| + MachineRepresentation::kBit); |
| + if (lower()) ChangeToPureOp(node, Int32Op(node)); |
| + return; |
| + } |
| + DCHECK_EQ(CompareOperationHints::kNumberOrUndefined, hint); |
| + // default case => Float64 comparison |
| + VisitBinop(node, UseInfo::CheckedNumberOrUndefinedAsFloat64(), |
| + MachineRepresentation::kBit); |
| + if (lower()) ChangeToPureOp(node, Float64Op(node)); |
| + return; |
| + } |
| + |
| case IrOpcode::kNumberAdd: |
| case IrOpcode::kNumberSubtract: { |
| if (BothInputsAre(node, Type::Signed32()) && |