Chromium Code Reviews| Index: src/compiler/machine-operator-reducer.cc |
| diff --git a/src/compiler/machine-operator-reducer.cc b/src/compiler/machine-operator-reducer.cc |
| index 127c6c5870b3f1568d58094fe0c3d49de7c04b6a..69175d87028f20b6e7eb334dd1de11f1498ff5ec 100644 |
| --- a/src/compiler/machine-operator-reducer.cc |
| +++ b/src/compiler/machine-operator-reducer.cc |
| @@ -606,7 +606,13 @@ Reduction MachineOperatorReducer::Reduce(Node* node) { |
| } |
| case IrOpcode::kChangeFloat32ToFloat64: { |
| Float32Matcher m(node->InputAt(0)); |
| - if (m.HasValue()) return ReplaceFloat64(m.Value()); |
| + if (m.HasValue()) { |
| + if (!allow_signalling_nan_ && std::isnan(m.Value())) { |
| + // Do some calculation to make guarantee the value is a quiet NaN. |
| + return ReplaceFloat64(m.Value() + m.Value()); |
|
titzer
2017/02/01 15:36:44
That doesn't seem right. It would return 2x the in
ahaas
2017/02/01 16:23:56
It is correct because m.Value() is a NaN, and ther
titzer
2017/02/01 18:00:33
Ok, make sense.
|
| + } |
| + return ReplaceFloat64(m.Value()); |
| + } |
| break; |
| } |
| case IrOpcode::kChangeFloat64ToInt32: { |
| @@ -655,8 +661,15 @@ Reduction MachineOperatorReducer::Reduce(Node* node) { |
| } |
| case IrOpcode::kTruncateFloat64ToFloat32: { |
| Float64Matcher m(node->InputAt(0)); |
| - if (m.HasValue()) return ReplaceFloat32(DoubleToFloat32(m.Value())); |
| - if (m.IsChangeFloat32ToFloat64()) return Replace(m.node()->InputAt(0)); |
| + if (m.HasValue()) { |
| + if (!allow_signalling_nan_ && std::isnan(m.Value())) { |
| + // Do some calculation to make guarantee the value is a quiet NaN. |
| + return ReplaceFloat32(DoubleToFloat32(m.Value() + m.Value())); |
| + } |
| + return ReplaceFloat32(DoubleToFloat32(m.Value())); |
| + } |
| + if (allow_signalling_nan_ && m.IsChangeFloat32ToFloat64()) |
| + return Replace(m.node()->InputAt(0)); |
| break; |
| } |
| case IrOpcode::kRoundFloat64ToInt32: { |