Index: src/compiler/js-typed-lowering.cc |
diff --git a/src/compiler/js-typed-lowering.cc b/src/compiler/js-typed-lowering.cc |
index c4bd1d2b4a283715566751c038feead60ec61554..5eb3ea7dc0fa712b96841fe721953f2c71adcdf8 100644 |
--- a/src/compiler/js-typed-lowering.cc |
+++ b/src/compiler/js-typed-lowering.cc |
@@ -343,12 +343,25 @@ Reduction JSTypedLowering::ReduceJSAdd(Node* node) { |
Reduction JSTypedLowering::ReduceNumberBinop(Node* node, |
const Operator* numberOp) { |
+ if (is_strong(OpParameter<LanguageMode>(node))) { |
+ return ReduceStrongNumberBinop(node, numberOp); |
rossberg
2015/04/23 13:29:37
I'd just inline the function.
Michael Starzinger
2015/04/23 13:47:52
+1
conradw
2015/04/23 14:51:54
Done.
|
+ } |
JSBinopReduction r(this, node); |
Node* frame_state = NodeProperties::GetFrameStateInput(node, 1); |
r.ConvertInputsToNumber(frame_state); |
return r.ChangeToPureOperator(numberOp, Type::Number()); |
} |
+Reduction JSTypedLowering::ReduceStrongNumberBinop(Node* node, |
+ const Operator* numberOp) { |
+ JSBinopReduction r(this, node); |
+ if (r.left_type()->Is(Type::Number()) && |
+ (r.right_type()->Is(Type::Number()))) { |
+ return r.ChangeToPureOperator(numberOp, Type::Number()); |
+ } |
+ return NoChange(); |
+} |
+ |
Reduction JSTypedLowering::ReduceInt32Binop(Node* node, const Operator* intOp) { |
JSBinopReduction r(this, node); |