Chromium Code Reviews| Index: src/compiler/change-lowering.cc |
| diff --git a/src/compiler/change-lowering.cc b/src/compiler/change-lowering.cc |
| index e9fd7400d03a6933a37d103c376099cb8067abbe..27d8222475140dd52c4623e62ec91e83c405b846 100644 |
| --- a/src/compiler/change-lowering.cc |
| +++ b/src/compiler/change-lowering.cc |
| @@ -111,8 +111,8 @@ Reduction ChangeLowering::ChangeBitToBool(Node* val, Node* control) { |
| Node* false_value = jsgraph()->FalseConstant(); |
| Node* merge = graph()->NewNode(common()->Merge(2), if_true, if_false); |
| - Node* phi = |
| - graph()->NewNode(common()->Phi(2), true_value, false_value, merge); |
| + Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), true_value, |
|
titzer
2014/09/05 10:26:08
kTypeBool | kRepTagged
... not that it matters th
Benedikt Meurer
2014/09/05 10:50:49
Done.
|
| + false_value, merge); |
| return Replace(phi); |
| } |
| @@ -150,7 +150,8 @@ Reduction ChangeLowering::ChangeInt32ToTagged(Node* val, Node* control) { |
| Node* smi = graph()->NewNode(common()->Projection(0), add); |
| Node* merge = graph()->NewNode(common()->Merge(2), if_true, if_false); |
| - Node* phi = graph()->NewNode(common()->Phi(2), heap_number, smi, merge); |
| + Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), heap_number, |
| + smi, merge); |
| return Replace(phi); |
| } |
| @@ -174,7 +175,9 @@ Reduction ChangeLowering::ChangeTaggedToUI32(Node* val, Node* control, |
| Node* number = ChangeSmiToInt32(val); |
| Node* merge = graph()->NewNode(common()->Merge(2), if_true, if_false); |
| - Node* phi = graph()->NewNode(common()->Phi(2), change, number, merge); |
| + Node* phi = graph()->NewNode( |
| + common()->Phi((signedness == kSigned) ? kMachInt32 : kMachUint32, 2), |
| + change, number, merge); |
| return Replace(phi); |
| } |
| @@ -196,7 +199,8 @@ Reduction ChangeLowering::ChangeTaggedToFloat64(Node* val, Node* control) { |
| ChangeSmiToInt32(val)); |
| Node* merge = graph()->NewNode(common()->Merge(2), if_true, if_false); |
| - Node* phi = graph()->NewNode(common()->Phi(2), load, number, merge); |
| + Node* phi = |
| + graph()->NewNode(common()->Phi(kMachFloat64, 2), load, number, merge); |
| return Replace(phi); |
| } |
| @@ -223,7 +227,8 @@ Reduction ChangeLowering::ChangeUint32ToTagged(Node* val, Node* control) { |
| graph()->NewNode(machine()->ChangeUint32ToFloat64(), val), if_false); |
| Node* merge = graph()->NewNode(common()->Merge(2), if_true, if_false); |
| - Node* phi = graph()->NewNode(common()->Phi(2), smi, heap_number, merge); |
| + Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), smi, |
| + heap_number, merge); |
| return Replace(phi); |
| } |